diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/tilesets/tileset_anims.asm | 2 | ||||
| -rw-r--r-- | engine/tilesets/tileset_palettes.asm | 28 |
2 files changed, 15 insertions, 15 deletions
diff --git a/engine/tilesets/tileset_anims.asm b/engine/tilesets/tileset_anims.asm index d596849d2..f8869b59b 100644 --- a/engine/tilesets/tileset_anims.asm +++ b/engine/tilesets/tileset_anims.asm @@ -259,7 +259,7 @@ TilesetChampionsRoomAnim: TilesetLighthouseAnim: TilesetPlayersRoomAnim: TilesetPokeComCenterAnim: -TilesetBattleTowerAnim: +TilesetBattleTowerInsideAnim: TilesetRuinsOfAlphAnim: TilesetRadioTowerAnim: TilesetUndergroundAnim: diff --git a/engine/tilesets/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm index 459cd74c2..3654d7e3c 100644 --- a/engine/tilesets/tileset_palettes.asm +++ b/engine/tilesets/tileset_palettes.asm @@ -2,8 +2,8 @@ LoadSpecialMapPalette: ld a, [wMapTileset] cp TILESET_POKECOM_CENTER jr z, .pokecom_2f - cp TILESET_BATTLE_TOWER - jr z, .battle_tower + cp TILESET_BATTLE_TOWER_INSIDE + jr z, .battle_tower_inside cp TILESET_ICE_PATH jr z, .ice_path cp TILESET_HOUSE @@ -14,17 +14,17 @@ LoadSpecialMapPalette: jr z, .mansion_mobile jr .do_nothing -.pokecom_2f +.pokecom_2f: call LoadPokeComPalette scf ret -.battle_tower - call LoadBattleTowerPalette +.battle_tower_inside: + call LoadBattleTowerInsidePalette scf ret -.ice_path +.ice_path: ld a, [wEnvironment] and $7 cp INDOOR ; Hall of Fame @@ -33,22 +33,22 @@ LoadSpecialMapPalette: scf ret -.house +.house: call LoadHousePalette scf ret -.radio_tower +.radio_tower: call LoadRadioTowerPalette scf ret -.mansion_mobile +.mansion_mobile: call LoadMansionPalette scf ret -.do_nothing +.do_nothing: and a ret @@ -63,16 +63,16 @@ LoadPokeComPalette: PokeComPalette: INCLUDE "gfx/tilesets/pokecom_center.pal" -LoadBattleTowerPalette: +LoadBattleTowerInsidePalette: ld a, BANK(wBGPals1) ld de, wBGPals1 - ld hl, BattleTowerPalette + ld hl, BattleTowerInsidePalette ld bc, 8 palettes call FarCopyWRAM ret -BattleTowerPalette: -INCLUDE "gfx/tilesets/battle_tower.pal" +BattleTowerInsidePalette: +INCLUDE "gfx/tilesets/battle_tower_inside.pal" LoadIcePathPalette: ld a, BANK(wBGPals1) |