Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Punchier tera animation #4507

Merged
merged 4 commits into from
May 7, 2024
Merged

Punchier tera animation #4507

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
473ea06
Punchier tera animation
Pokabbie May 6, 2024
af82f56
Removed testing comments
Pokabbie May 6, 2024
d8de131
Replaced VARIOUS_APPLY_TERASTALLIZATION with callnative
Pokabbie May 6, 2024
8ea9d9c
Remove redundant arg from applyterastallization
Pokabbie May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions asm/macros/battle_script.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1641,6 +1641,11 @@
.macro removeweather
callnative BS_RemoveWeather
.endm

.macro applyterastallization battler:req
callnative BS_ApplyTerastallization
.byte \battler
.endm

@ various command changed to more readable macros
.macro cancelmultiturnmoves battler:req
Expand Down Expand Up @@ -2277,10 +2282,6 @@
various \battler, VARIOUS_ACTIVATE_TERRAIN_CHANGE_ABILITIES
.endm

.macro applyterastallization battler:req
various \battler, VARIOUS_APPLY_TERASTALLIZATION
.endm

@ helpful macros
.macro setstatchanger stat:req, stages:req, down:req
setbyte sSTATCHANGER, \stat | \stages << 3 | \down << 7
Expand Down
1 change: 0 additions & 1 deletion include/constants/battle_script_commands.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,6 @@
#define VARIOUS_STORE_HEALING_WISH 145
#define VARIOUS_HIT_SWITCH_TARGET_FAILED 146
#define VARIOUS_TRY_REVIVAL_BLESSING 147
#define VARIOUS_APPLY_TERASTALLIZATION 148

// Cmd_manipulatedamage
#define DMG_CHANGE_SIGN 0
Expand Down
16 changes: 9 additions & 7 deletions src/battle_script_commands.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10814,13 +10814,6 @@ static void Cmd_various(void)
AbilityBattleEffects(ABILITYEFFECT_ON_TERRAIN, battler, 0, 0, 0);
return;
}
case VARIOUS_APPLY_TERASTALLIZATION:
{
VARIOUS_ARGS();
gBattlescriptCurrInstr = cmd->nextInstr;
ApplyBattlerVisualsForTeraAnim(battler);
return;
}
case VARIOUS_STORE_HEALING_WISH:
{
VARIOUS_ARGS();
Expand Down Expand Up @@ -16919,3 +16912,12 @@ void BS_RemoveWeather(void)
RemoveAllWeather();
gBattlescriptCurrInstr = cmd->nextInstr;
}

void BS_ApplyTerastallization(void)
{
NATIVE_ARGS(u8 battler);
Pokabbie marked this conversation as resolved.
Show resolved Hide resolved

u8 battler = GetBattlerForBattleScript(cmd->battler);
ApplyBattlerVisualsForTeraAnim(battler);
gBattlescriptCurrInstr = cmd->nextInstr;
}
Pokabbie marked this conversation as resolved.
Show resolved Hide resolved
Loading