diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-10-20 12:39:55 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-20 12:39:55 -0500 |
| commit | 35a96cb0c007545ecc87732f8dc8b2eb93e3ecc2 (patch) | |
| tree | 79174cee322cfcaac7dec1ac43f668fa747d99c3 /src/battle_anim.c | |
| parent | ae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff) | |
| parent | ccd7e8b3b1d942b2e1289611639f4e9a188cdc20 (diff) | |
Merge pull request #88 from DizzyEggg/decompile_battle_interface
decompile battle interface
Diffstat (limited to 'src/battle_anim.c')
| -rw-r--r-- | src/battle_anim.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c index 8b858f34a..023272017 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -244,7 +244,7 @@ void DoBattleAnim(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim) if (!IsContest()) { sub_80A8278(); - sub_8072A88(0); + UpdateOamPriorityInAllHealthboxes(0); for (i = 0; i < BATTLE_BANKS_COUNT; i++) { if (GetBankSide(i) != 0) @@ -549,7 +549,7 @@ static void ScriptCmd_end(void) if (!IsContest()) { sub_80A8278(); - sub_8072A88(1); + UpdateOamPriorityInAllHealthboxes(1); } gAnimScriptActive = FALSE; } @@ -1284,39 +1284,39 @@ s8 BattleAnimAdjustPanning(s8 pan) if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gAnimBankAttacker].flag_x10) { if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) - pan = PAN_ATTACKER_OPPONENT; + pan = PAN_SIDE_OPPONENT; else - pan = PAN_ATTACKER_PLAYER; + pan = PAN_SIDE_PLAYER; } else if (IsContest()) { - if (gAnimBankAttacker != gAnimBankTarget || gAnimBankAttacker != 2 || pan != PAN_ATTACKER_OPPONENT) + if (gAnimBankAttacker != gAnimBankTarget || gAnimBankAttacker != 2 || pan != PAN_SIDE_OPPONENT) pan *= -1; } else if (GetBankSide(gAnimBankAttacker) == SIDE_PLAYER) { if (GetBankSide(gAnimBankTarget) == SIDE_PLAYER) { - if (pan == PAN_ATTACKER_OPPONENT) - pan = PAN_ATTACKER_PLAYER; - else if (pan != PAN_ATTACKER_PLAYER) + if (pan == PAN_SIDE_OPPONENT) + pan = PAN_SIDE_PLAYER; + else if (pan != PAN_SIDE_PLAYER) pan *= -1; } } else if (GetBankSide(gAnimBankTarget) == SIDE_OPPONENT) { - if (pan == PAN_ATTACKER_PLAYER) - pan = PAN_ATTACKER_OPPONENT; + if (pan == PAN_SIDE_PLAYER) + pan = PAN_SIDE_OPPONENT; } else { pan *= -1; } - if (pan > PAN_ATTACKER_OPPONENT) - pan = PAN_ATTACKER_OPPONENT; - else if (pan < PAN_ATTACKER_PLAYER) - pan = PAN_ATTACKER_PLAYER; + if (pan > PAN_SIDE_OPPONENT) + pan = PAN_SIDE_OPPONENT; + else if (pan < PAN_SIDE_PLAYER) + pan = PAN_SIDE_PLAYER; return pan; } @@ -1326,9 +1326,9 @@ s8 BattleAnimAdjustPanning2(s8 pan) if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gAnimBankAttacker].flag_x10) { if (GetBankSide(gAnimBankAttacker) != SIDE_PLAYER) - pan = PAN_ATTACKER_OPPONENT; + pan = PAN_SIDE_OPPONENT; else - pan = PAN_ATTACKER_PLAYER; + pan = PAN_SIDE_PLAYER; } else { |