diff options
Diffstat (limited to 'src/battle_anim.c')
| -rw-r--r-- | src/battle_anim.c | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 2eec0bed5..fa4dfb48f 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1,6 +1,7 @@ #include "global.h" #include "battle.h" #include "battle_anim.h" +#include "constants/battle_anim.h" #include "sprite.h" #include "contest.h" #include "m4a.h" @@ -67,7 +68,7 @@ static void ScriptCmd_return(void); static void ScriptCmd_setarg(void); static void ScriptCmd_choosetwoturnanim(void); static void ScriptCmd_jumpifmoveturn(void); -static void ScriptCmd_jump(void); +static void ScriptCmd_goto(void); static void ScriptCmd_fadetobg(void); static void ScriptCmd_restorebg(void); static void ScriptCmd_waitbgfadeout(void); @@ -156,7 +157,7 @@ static void (* const sScriptCmdTable[])(void) = ScriptCmd_setarg, ScriptCmd_choosetwoturnanim, ScriptCmd_jumpifmoveturn, - ScriptCmd_jump, + ScriptCmd_goto, ScriptCmd_fadetobg, ScriptCmd_restorebg, ScriptCmd_waitbgfadeout, @@ -605,7 +606,7 @@ static void ScriptCmd_monbg(void) sBattleAnimScriptPtr++; animBank = sBattleAnimScriptPtr[0]; - if (animBank & ANIM_BANK_TARGET) + if (animBank & ANIM_TARGET) bank = gAnimBankTarget; else bank = gAnimBankAttacker; @@ -862,12 +863,12 @@ static void ScriptCmd_clearmonbg(void) sBattleAnimScriptPtr++; animBankId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_BANK_ATTACKER) - animBankId = ANIM_BANK_ATK_PARTNER; - else if (animBankId == ANIM_BANK_TARGET) - animBankId = ANIM_BANK_DEF_PARTNER; + if (animBankId == ANIM_ATTACKER) + animBankId = ANIM_ATK_PARTNER; + else if (animBankId == ANIM_TARGET) + animBankId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) bank = gAnimBankAttacker; else bank = gAnimBankTarget; @@ -924,12 +925,12 @@ static void ScriptCmd_monbg_22(void) animBankId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_BANK_ATTACKER) - animBankId = ANIM_BANK_ATK_PARTNER; - else if (animBankId == ANIM_BANK_TARGET) - animBankId = ANIM_BANK_DEF_PARTNER; + if (animBankId == ANIM_ATTACKER) + animBankId = ANIM_ATK_PARTNER; + else if (animBankId == ANIM_TARGET) + animBankId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) bank = gAnimBankAttacker; else bank = gAnimBankTarget; @@ -969,12 +970,12 @@ static void ScriptCmd_clearmonbg_23(void) sBattleAnimScriptPtr++; animBankId = sBattleAnimScriptPtr[0]; - if (animBankId == ANIM_BANK_ATTACKER) - animBankId = ANIM_BANK_ATK_PARTNER; - else if (animBankId == ANIM_BANK_TARGET) - animBankId = ANIM_BANK_DEF_PARTNER; + if (animBankId == ANIM_ATTACKER) + animBankId = ANIM_ATK_PARTNER; + else if (animBankId == ANIM_TARGET) + animBankId = ANIM_DEF_PARTNER; - if (animBankId == ANIM_BANK_ATTACKER || animBankId == ANIM_BANK_ATK_PARTNER) + if (animBankId == ANIM_ATTACKER || animBankId == ANIM_ATK_PARTNER) bank = gAnimBankAttacker; else bank = gAnimBankTarget; @@ -1099,7 +1100,7 @@ static void ScriptCmd_jumpifmoveturn(void) sBattleAnimScriptPtr += 4; } -static void ScriptCmd_jump(void) +static void ScriptCmd_goto(void) { sBattleAnimScriptPtr++; sBattleAnimScriptPtr = SCRIPT_READ_PTR(sBattleAnimScriptPtr); @@ -1699,7 +1700,7 @@ static void ScriptCmd_monbgprio_28(void) wantedBank = sBattleAnimScriptPtr[1]; sBattleAnimScriptPtr += 2; - if (wantedBank != ANIM_BANK_ATTACKER) + if (wantedBank != ANIM_ATTACKER) bank = gAnimBankTarget; else bank = gAnimBankAttacker; @@ -1732,7 +1733,7 @@ static void ScriptCmd_monbgprio_2A(void) sBattleAnimScriptPtr += 2; if (GetBankSide(gAnimBankAttacker) != GetBankSide(gAnimBankTarget)) { - if (wantedBank != ANIM_BANK_ATTACKER) + if (wantedBank != ANIM_ATTACKER) bank = gAnimBankTarget; else bank = gAnimBankAttacker; @@ -1779,15 +1780,15 @@ static void ScriptCmd_doublebattle_2D(void) if (!IsContest() && IsDoubleBattle() && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { - if (wantedBank == ANIM_BANK_ATTACKER) + if (wantedBank == ANIM_ATTACKER) { r4 = sub_80A8364(gAnimBankAttacker); - spriteId = GetAnimBankSpriteId(0); + spriteId = GetAnimBankSpriteId(ANIM_ATTACKER); } else { r4 = sub_80A8364(gAnimBankTarget); - spriteId = GetAnimBankSpriteId(1); + spriteId = GetAnimBankSpriteId(ANIM_TARGET); } if (spriteId != 0xFF) { @@ -1814,15 +1815,15 @@ static void ScriptCmd_doublebattle_2E(void) if (!IsContest() && IsDoubleBattle() && GetBankSide(gAnimBankAttacker) == GetBankSide(gAnimBankTarget)) { - if (wantedBank == ANIM_BANK_ATTACKER) + if (wantedBank == ANIM_ATTACKER) { r4 = sub_80A8364(gAnimBankAttacker); - spriteId = GetAnimBankSpriteId(0); + spriteId = GetAnimBankSpriteId(ANIM_ATTACKER); } else { r4 = sub_80A8364(gAnimBankTarget); - spriteId = GetAnimBankSpriteId(1); + spriteId = GetAnimBankSpriteId(ANIM_TARGET); } if (spriteId != 0xFF && r4 == 2) |