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 /home.asm | |
| parent | 84a3ff0d1ff71f94be27a8e1a0aa63481eea88f3 (diff) | |
| parent | 5c86071351aefd9ac0d15eeb7894da4160cfc761 (diff) | |
Merge branch 'master' of github.com:pret/pokeyellow
Diffstat (limited to 'home.asm')
| -rw-r--r-- | home.asm | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -316,7 +316,7 @@ OverwritewMoves:: ; 113a (0:113a) LoadFlippedFrontSpriteByMonIndex:: ; 1144 (0:1144) ld a, 1 - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a LoadFrontSpriteByMonIndex:: ; 1149 (0:1149) push hl @@ -350,7 +350,7 @@ LoadFrontSpriteByMonIndex:: ; 1149 (0:1149) ld [hStartTileID], a call CopyUncompressedPicToHL xor a - ld [W_SPRITEFLIPPED], a + ld [wSpriteFlipped], a pop af jp BankswitchCommon @@ -949,7 +949,7 @@ InterlaceMergeSpriteBuffers:: ; 14c7 (0:14c7) dec a ld [H_SPRITEINTERLACECOUNTER], a jr nz, .interlaceLoop - ld a, [W_SPRITEFLIPPED] + ld a, [wSpriteFlipped] and a jr z, .notFlipped ld bc, 2*SPRITEBUFFERSIZE |