diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-10 16:53:37 -0500 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-11-10 16:53:37 -0500 |
| commit | d13fb46d405eb1cbc78c4f7c8823cfce5cfdbfab (patch) | |
| tree | cc41006e4160aac7de10704bff7eaea30dc81591 /battle/misc.asm | |
| parent | ba05bfeafec51b183986ecaacd22c718ec21f56a (diff) | |
enum macros/move_anim.asm, resolve battle/anims.asm function labels
Diffstat (limited to 'battle/misc.asm')
| -rw-r--r-- | battle/misc.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/battle/misc.asm b/battle/misc.asm index 429e4aae6..d47573df9 100644 --- a/battle/misc.asm +++ b/battle/misc.asm @@ -1,7 +1,7 @@ _DisappearUser: ; fbd54 xor a - ld [hBGMapMode], a ; $ff00+$d4 - ld a, [hBattleTurn] ; $ff00+$e4 + ld [hBGMapMode], a + ld a, [hBattleTurn] and a jr z, .player call GetEnemyFrontpicCoords @@ -21,8 +21,8 @@ _AppearUserLowerSub: ; fbd71 (3e:7d71) AppearUser: ; fbd77 (3e:7d77) xor a - ld [hBGMapMode], a ; $ff00+$d4 - ld a, [hBattleTurn] ; $ff00+$e4 + ld [hBGMapMode], a + ld a, [hBattleTurn] and a jr z, .player call GetEnemyFrontpicCoords @@ -36,7 +36,7 @@ AppearUser: ; fbd77 (3e:7d77) predef FillBox FinishAppearDisappearUser: ; fbd91 (3e:7d91) ld a, $1 - ld [hBGMapMode], a ; $ff00+$d4 + ld [hBGMapMode], a ret GetEnemyFrontpicCoords: ; fbd96 (3e:7d96) |