diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-19 10:23:58 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-10-19 10:23:58 -0400 |
| commit | 0a244e043c83dff064d7e3ec054a587c7f999d0d (patch) | |
| tree | fa04984075ef0e37674a9d2025f2765d4764260f /home/battle.asm | |
| parent | 52605b764a6ecfb781ca9e70d51dad909dabe7c3 (diff) | |
Move battle start animation functions to its own file
Diffstat (limited to 'home/battle.asm')
| -rw-r--r-- | home/battle.asm | 34 |
1 files changed, 3 insertions, 31 deletions
diff --git a/home/battle.asm b/home/battle.asm index a374d59bc..37f39572a 100644 --- a/home/battle.asm +++ b/home/battle.asm @@ -106,7 +106,7 @@ UpdateEnemyMonInParty:: ; 39b0 ; Update level, status, current HP ; No wildmons. - ld a, [IsInBattle] + ld a, [wBattleMode] dec a ret z @@ -194,34 +194,6 @@ endr dw .status, .statusopp, .animation, .effect, .power, .type dw .curmove, .lastcounter, .lastcounteropp, .lastmove, .lastmoveopp - const_def - const PLAYER_SUBSTATUS_1 - const ENEMY_SUBSTATUS_1 - const PLAYER_SUBSTATUS_2 - const ENEMY_SUBSTATUS_2 - const PLAYER_SUBSTATUS_3 - const ENEMY_SUBSTATUS_3 - const PLAYER_SUBSTATUS_4 - const ENEMY_SUBSTATUS_4 - const PLAYER_SUBSTATUS_5 - const ENEMY_SUBSTATUS_5 - const PLAYER_STATUS - const ENEMY_STATUS - const PLAYER_MOVE_ANIMATION - const ENEMY_MOVE_ANIMATION - const PLAYER_MOVE_EFFECT - const ENEMY_MOVE_EFFECT - const PLAYER_MOVE_POWER - const ENEMY_MOVE_POWER - const PLAYER_MOVE_TYPE - const ENEMY_MOVE_TYPE - const PLAYER_CUR_MOVE - const ENEMY_CUR_MOVE - const PLAYER_COUNTER_MOVE - const ENEMY_COUNTER_MOVE - const PLAYER_LAST_MOVE - const ENEMY_LAST_MOVE - ; player enemy .substatus1 db PLAYER_SUBSTATUS_1, ENEMY_SUBSTATUS_1 .substatus1opp db ENEMY_SUBSTATUS_1, PLAYER_SUBSTATUS_1 @@ -293,8 +265,8 @@ CELL_PHONE_TOP EQU $5e CELL_PHONE_BOTTOM EQU $5f ; For mobile link battles only. - ld a, [InLinkBattle] - cp 4 + ld a, [wLinkMode] + cp LINK_MOBILE ret c ; Draw a cell phone icon at the |