diff options
Diffstat (limited to 'tilesets')
| -rw-r--r-- | tilesets/animations.asm | 14 | ||||
| -rw-r--r-- | tilesets/special_palettes.asm | 36 |
2 files changed, 25 insertions, 25 deletions
diff --git a/tilesets/animations.asm b/tilesets/animations.asm index 5db5c76e0..d500a24b8 100644 --- a/tilesets/animations.asm +++ b/tilesets/animations.asm @@ -941,7 +941,7 @@ TileAnimationPalette: ; fc6d7 ld a, [rSVBK] push af - ld a, BANK(UnknBGPals) + ld a, BANK(wBGPals1) ld [rSVBK], a ; Update color 0 in order 0 1 2 1 @@ -952,7 +952,7 @@ TileAnimationPalette: ; fc6d7 jr z, .color2 .color1 - ld hl, UnknBGPals palette PAL_BG_WATER + 2 + ld hl, wBGPals1 palette PAL_BG_WATER + 2 ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -960,7 +960,7 @@ TileAnimationPalette: ; fc6d7 jr .end .color0 - ld hl, UnknBGPals palette PAL_BG_WATER + ld hl, wBGPals1 palette PAL_BG_WATER ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -968,7 +968,7 @@ TileAnimationPalette: ; fc6d7 jr .end .color2 - ld hl, UnknBGPals palette PAL_BG_WATER + 4 + ld hl, wBGPals1 palette PAL_BG_WATER + 4 ld a, [hli] ld [rBGPD], a ld a, [hli] @@ -997,7 +997,7 @@ FlickeringCaveEntrancePalette: ; fc71e ld a, [rSVBK] push af - ld a, BANK(UnknBGPals) + ld a, BANK(wBGPals1) ld [rSVBK], a ; Ready for BGPD input... ld a, (1 << rBGPI_AUTO_INCREMENT) palette PAL_BG_YELLOW @@ -1005,11 +1005,11 @@ FlickeringCaveEntrancePalette: ; fc71e ld a, [hVBlankCounter] and 1 << 1 jr nz, .bit1set - ld hl, UnknBGPals palette PAL_BG_YELLOW + ld hl, wBGPals1 palette PAL_BG_YELLOW jr .okay .bit1set - ld hl, UnknBGPals palette PAL_BG_YELLOW + 2 + ld hl, wBGPals1 palette PAL_BG_YELLOW + 2 .okay ld a, [hli] diff --git a/tilesets/special_palettes.asm b/tilesets/special_palettes.asm index de7d09963..761b15348 100644 --- a/tilesets/special_palettes.asm +++ b/tilesets/special_palettes.asm @@ -54,8 +54,8 @@ LoadSpecialMapPalette: ; 494ac ; 494f2 LoadPokeComPalette: ; 494f2 - ld a, BANK(UnknBGPals) - ld de, UnknBGPals + ld a, BANK(wBGPals1) + ld de, wBGPals1 ld hl, PokeComPalette ld bc, 8 palettes call FarCopyWRAM @@ -67,8 +67,8 @@ INCLUDE "data/palettes/tilesets/pokecom_center.pal" ; 49541 LoadBattleTowerPalette: ; 49541 - ld a, BANK(UnknBGPals) - ld de, UnknBGPals + ld a, BANK(wBGPals1) + ld de, wBGPals1 ld hl, BattleTowerPalette ld bc, 8 palettes call FarCopyWRAM @@ -80,8 +80,8 @@ INCLUDE "data/palettes/tilesets/battle_tower.pal" ; 49590 LoadIcePathPalette: ; 49590 - ld a, BANK(UnknBGPals) - ld de, UnknBGPals + ld a, BANK(wBGPals1) + ld de, wBGPals1 ld hl, IcePathPalette ld bc, 8 palettes call FarCopyWRAM @@ -93,8 +93,8 @@ INCLUDE "data/palettes/tilesets/ice_path.pal" ; 495df LoadHousePalette: ; 495df - ld a, BANK(UnknBGPals) - ld de, UnknBGPals + ld a, BANK(wBGPals1) + ld de, wBGPals1 ld hl, HousePalette ld bc, 8 palettes call FarCopyWRAM @@ -106,8 +106,8 @@ INCLUDE "data/palettes/tilesets/house_1.pal" ; 4962e LoadRadioTowerPalette: ; 4962e - ld a, BANK(UnknBGPals) - ld de, UnknBGPals + ld a, BANK(wBGPals1) + ld de, wBGPals1 ld hl, RadioTowerPalette ld bc, 8 palettes call FarCopyWRAM @@ -169,23 +169,23 @@ MansionPalette4: ; 496bd ; 496c5 LoadMansionPalette: ; 496c5 - ld a, BANK(UnknBGPals) - ld de, UnknBGPals + ld a, BANK(wBGPals1) + ld de, wBGPals1 ld hl, MansionPalette1 ld bc, 8 palettes call FarCopyWRAM - ld a, BANK(UnknBGPals) - ld de, UnknBGPals palette PAL_BG_YELLOW + ld a, BANK(wBGPals1) + ld de, wBGPals1 palette PAL_BG_YELLOW ld hl, MansionPalette2 ld bc, 1 palettes call FarCopyWRAM - ld a, BANK(UnknBGPals) - ld de, UnknBGPals palette PAL_BG_WATER + ld a, BANK(wBGPals1) + ld de, wBGPals1 palette PAL_BG_WATER ld hl, MansionPalette3 ld bc, 1 palettes call FarCopyWRAM - ld a, BANK(UnknBGPals) - ld de, UnknBGPals palette PAL_BG_ROOF + ld a, BANK(wBGPals1) + ld de, wBGPals1 palette PAL_BG_ROOF ld hl, MansionPalette4 ld bc, 1 palettes call FarCopyWRAM |