diff options
| author | yenatch <yenatch@gmail.com> | 2015-11-13 00:44:06 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-11-13 00:44:06 -0500 |
| commit | 9c5473e965520f672640daf4ee76622640e0de15 (patch) | |
| tree | 33d513a05a026cb6c094eb7ee73ad52ee36d0888 /tilesets/animations.asm | |
| parent | 1c1fe276ca59726bb0008c60006c6b48cd093573 (diff) | |
| parent | 40802da3cf27a453f62c8c4b712e876b06a9d834 (diff) | |
Merge pull request #326 from PikalaxALT/master
Reopen #325
Diffstat (limited to 'tilesets/animations.asm')
| -rw-r--r-- | tilesets/animations.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tilesets/animations.asm b/tilesets/animations.asm index c84db6785..d0e44a063 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -958,7 +958,7 @@ TileAnimationPalette: ; fc6d7 jr z, .color2 .color1 - ld hl, Unkn1Pals + $1a ; pal 3 color 1 + ld hl, wMapPals + $1a ; pal 3 color 1 ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -966,7 +966,7 @@ TileAnimationPalette: ; fc6d7 jr .end .color0 - ld hl, Unkn1Pals + $18 ; pal 3 color 0 + ld hl, wMapPals + $18 ; pal 3 color 0 ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -974,7 +974,7 @@ TileAnimationPalette: ; fc6d7 jr .end .color2 - ld hl, Unkn1Pals + $1c ; pal 3 color 2 + ld hl, wMapPals + $1c ; pal 3 color 2 ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -1008,14 +1008,14 @@ FlickeringCaveEntrancePalette: ; fc71e ; Ready for BGPD input... ld a, %10100000 ; auto-increment, index $20 (pal 4 color 0) ld [rBGPI], a - ld a, [$ff9b] + ld a, [hVBlankCounter] and %00000010 jr nz, .bit1set - ld hl, Unkn1Pals + $20 ; pal 4 color 0 + ld hl, wMapPals + $20 ; pal 4 color 0 jr .okay .bit1set - ld hl, Unkn1Pals + $22 ; pal 4 color 2 + ld hl, wMapPals + $22 ; pal 4 color 2 .okay ld a, [hli] |