diff options
| -rw-r--r-- | asm/macros/battle_script.inc | 2 | ||||
| -rw-r--r-- | data/battle_scripts_1.s | 6 | ||||
| -rw-r--r-- | src/battle_script_commands.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 5b283b647..927a0edd1 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -530,7 +530,7 @@ .byte \battler .endm - .macro jumptocalledattack param0 + .macro jumptocalledmove param0 .byte 0x63 .byte \param0 .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a9dfd7635..a01066be1 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1354,7 +1354,7 @@ BattleScript_SleepTalkUsingMove:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptocalledattack TRUE + jumptocalledmove TRUE BattleScript_EffectDestinyBond:: attackcanceler @@ -2399,7 +2399,7 @@ BattleScript_EffectAssist:: waitanimation setbyte sB_ANIM_TURN, 0x0 setbyte sB_ANIM_TARGETS_HIT, 0x0 - jumptocalledattack TRUE + jumptocalledmove TRUE BattleScript_EffectIngrain:: attackcanceler @@ -4260,7 +4260,7 @@ BattleScript_IgnoresWhileAsleep:: BattleScript_IgnoresAndUsesRandomMove:: printstring STRINGID_PKMNIGNOREDORDERS waitmessage 0x40 - jumptocalledattack FALSE + jumptocalledmove FALSE BattleScript_MoveUsedLoafingAround:: jumpifbyte CMP_NOT_EQUAL, cMULTISTRING_CHOOSER, 0x4, BattleScript_82DB6C7 diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index c8f3f1175..10b432d8e 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -190,7 +190,7 @@ static void atk5F_swapattackerwithtarget(void); static void atk60_incrementgamestat(void); static void atk61_drawpartystatussummary(void); static void atk62_hidepartystatussummary(void); -static void atk63_jumptocalledattack(void); +static void atk63_jumptocalledmove(void); static void atk64_statusanimation(void); static void atk65_status2animation(void); static void atk66_chosenstatusanimation(void); @@ -442,7 +442,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = atk60_incrementgamestat, atk61_drawpartystatussummary, atk62_hidepartystatussummary, - atk63_jumptocalledattack, + atk63_jumptocalledmove, atk64_statusanimation, atk65_status2animation, atk66_chosenstatusanimation, @@ -6049,7 +6049,7 @@ static void atk62_hidepartystatussummary(void) gBattlescriptCurrInstr += 2; } -static void atk63_jumptocalledattack(void) +static void atk63_jumptocalledmove(void) { if (gBattlescriptCurrInstr[1]) gCurrentMove = gCalledMove; |