diff options
| author | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 20:44:18 -0400 |
|---|---|---|
| committer | pikalaxalt <PikalaxALT@gmail.com> | 2016-05-30 20:44:18 -0400 |
| commit | e676e031a57371010742f779639024e371d5dc9f (patch) | |
| tree | 99f751b218c28f1df3181c927142eab5e19ba6a8 /engine/battle | |
| parent | 84a3ff0d1ff71f94be27a8e1a0aa63481eea88f3 (diff) | |
| parent | 5c86071351aefd9ac0d15eeb7894da4160cfc761 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'engine/battle')
| -rwxr-xr-x | engine/battle/animations.asm | 2 | ||||
| -rw-r--r-- | engine/battle/bank3d_battle.asm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm index d07e0b42..52d2ee6e 100755 --- a/engine/battle/animations.asm +++ b/engine/battle/animations.asm @@ -2300,7 +2300,7 @@ ChangeMonPic: ; 798d4 (1e:58d4) ld [wcf91], a ld [wd0b5], a xor a - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a call GetMonHeader coord hl, 12, 0 call LoadFrontSpriteByMonIndex diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm index b9713cec..7f8854a4 100644 --- a/engine/battle/bank3d_battle.asm +++ b/engine/battle/bank3d_battle.asm @@ -237,7 +237,7 @@ CopyUncompressedPicToHL: ; f6203 (3d:6203) ld bc, $707 ld de, $14 push af - ld a, [W_SPRITEFLIPPED] + ld a, [wSpriteFlipped] and a jr nz, .asm_f6220 pop af |