diff options
Diffstat (limited to 'tilesets')
| -rw-r--r-- | tilesets/animations.asm | 12 | ||||
| -rw-r--r-- | tilesets/tileset_headers.asm | 4 |
2 files changed, 7 insertions, 9 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] diff --git a/tilesets/tileset_headers.asm b/tilesets/tileset_headers.asm index 65f01dea3..752ff1cc0 100644 --- a/tilesets/tileset_headers.asm +++ b/tilesets/tileset_headers.asm @@ -1,7 +1,5 @@ tileset: macro - dbw BANK(\1GFX), \1GFX - dbw BANK(\1Meta), \1Meta - dbw BANK(\1Coll), \1Coll + dba \1GFX, \1Meta, \1Coll dw \1Anim dw NULL dw \1PalMap |