diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
| commit | 98128cd4d8457948e7136a16e08bacff0bc3529d (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /battle/anim_commands.asm | |
| parent | 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff) | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'battle/anim_commands.asm')
| -rw-r--r-- | battle/anim_commands.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/battle/anim_commands.asm b/battle/anim_commands.asm index 958dcfe40..b4633d8dd 100644 --- a/battle/anim_commands.asm +++ b/battle/anim_commands.asm @@ -57,7 +57,7 @@ _PlayBattleAnim: ; cc0e4 BattleAnimRunScript: ; cc11c - ld a, [FXAnimIDHi] + ld a, [FXAnimID + 1] and a jr nz, .hi_byte @@ -86,9 +86,9 @@ BattleAnimRunScript: ; cc11c ld de, ANIM_MISS add hl, de ld a, l - ld [FXAnimIDLo], a + ld [FXAnimID], a ld a, h - ld [FXAnimIDHi], a + ld [FXAnimID + 1], a .hi_byte call WaitSFX @@ -112,11 +112,11 @@ RunBattleAnimScript: ; cc163 call BattleAnimRequestPals ; Speed up Rollout's animation. - ld a, [FXAnimIDHi] + ld a, [FXAnimID + 1] or a jr nz, .not_rollout - ld a, [FXAnimIDLo] + ld a, [FXAnimID] cp ROLLOUT jr nz, .not_rollout @@ -1393,7 +1393,7 @@ ClearBattleAnims: ; cc8d3 or b jr nz, .loop - ld hl, FXAnimIDLo + ld hl, FXAnimID ld e, [hl] inc hl ld d, [hl] |