Rooba
/
pokeemerald
mirror of https://github.com/pret/pokeemerald.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

calledattack to calledmove

This commit is contained in:
DizzyEggg 2018-09-22 19:08:41 +02:00
parent e362c06aea
commit 611360c29e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/macros/battle_script.inc
View File

@ -530,7 +530,7 @@
.byte \battler
.endm
.macro jumptocalledattack param0
.macro jumptocalledmove param0
.byte 0x63
.byte \param0
.endm

6
data/battle_scripts_1.s
View File

@ -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

6
src/battle_script_commands.c
View File

@ -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;