From 01f68fcc6ab477c7feaa07979391de9649f70fb4 Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 3 Nov 2019 12:03:37 -0500 Subject: [PATCH] Rename TILESET_BATTLE_TOWER to TILESET_BATTLE_TOWER_INSIDE --- constants/tileset_constants.asm | 2 +- data/maps/maps.asm | 8 ++--- data/tilesets.asm | 2 +- ....asm => battle_tower_inside_collision.asm} | 0 ....bin => battle_tower_inside_metatiles.bin} | Bin engine/tilesets/tileset_anims.asm | 2 +- engine/tilesets/tileset_palettes.asm | 28 +++++++++--------- gfx/tileset_palette_maps.asm | 4 +-- gfx/tilesets.asm | 12 ++++---- ...d => battle_tower_inside.2bpp.lz.467b6a2d} | Bin ...ttle_tower.pal => battle_tower_inside.pal} | 0 ...ttle_tower.png => battle_tower_inside.png} | Bin ...sm => battle_tower_inside_palette_map.asm} | 0 13 files changed, 29 insertions(+), 29 deletions(-) rename data/tilesets/{battle_tower_collision.asm => battle_tower_inside_collision.asm} (100%) rename data/tilesets/{battle_tower_metatiles.bin => battle_tower_inside_metatiles.bin} (100%) rename gfx/tilesets/{battle_tower.2bpp.lz.467b6a2d => battle_tower_inside.2bpp.lz.467b6a2d} (100%) rename gfx/tilesets/{battle_tower.pal => battle_tower_inside.pal} (100%) rename gfx/tilesets/{battle_tower.png => battle_tower_inside.png} (100%) rename gfx/tilesets/{battle_tower_palette_map.asm => battle_tower_inside_palette_map.asm} (100%) diff --git a/constants/tileset_constants.asm b/constants/tileset_constants.asm index e89714fee..79be4ad57 100644 --- a/constants/tileset_constants.asm +++ b/constants/tileset_constants.asm @@ -21,7 +21,7 @@ const TILESET_LIGHTHOUSE ; 13 const TILESET_PLAYERS_ROOM ; 14 const TILESET_POKECOM_CENTER ; 15 - const TILESET_BATTLE_TOWER ; 16 + const TILESET_BATTLE_TOWER_INSIDE ; 16 const TILESET_TOWER ; 17 const TILESET_CAVE ; 18 const TILESET_PARK ; 19 diff --git a/data/maps/maps.asm b/data/maps/maps.asm index 1cc528738..268c4be8d 100644 --- a/data/maps/maps.asm +++ b/data/maps/maps.asm @@ -416,10 +416,10 @@ MapGroup_Cianwood: map CianwoodPhotoStudio, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map CianwoodLugiaSpeechHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE map PokeSeersHouse, TILESET_HOUSE, INDOOR, CIANWOOD_CITY, MUSIC_ECRUTEAK_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTower1F, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerBattleRoom, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerElevator, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE - map BattleTowerHallway, TILESET_BATTLE_TOWER, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTower1F, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_LOBBY, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerBattleRoom, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerElevator, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_NONE, TRUE, PALETTE_DAY, FISHGROUP_SHORE + map BattleTowerHallway, TILESET_BATTLE_TOWER_INSIDE, INDOOR, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, TRUE, PALETTE_DAY, FISHGROUP_SHORE map Route40BattleTowerGate, TILESET_GATE, GATE, BATTLE_TOWER, MUSIC_ROUTE_36, FALSE, PALETTE_DAY, FISHGROUP_SHORE map BattleTowerOutside, TILESET_BATTLE_TOWER_OUTSIDE, ROUTE, BATTLE_TOWER, MUSIC_BATTLE_TOWER_THEME, FALSE, PALETTE_AUTO, FISHGROUP_SHORE diff --git a/data/tilesets.asm b/data/tilesets.asm index b95c20f40..eb5b6fe49 100644 --- a/data/tilesets.asm +++ b/data/tilesets.asm @@ -34,7 +34,7 @@ Tilesets:: tileset TilesetLighthouse tileset TilesetPlayersRoom tileset TilesetPokeComCenter - tileset TilesetBattleTower + tileset TilesetBattleTowerInside tileset TilesetTower tileset TilesetCave tileset TilesetPark diff --git a/data/tilesets/battle_tower_collision.asm b/data/tilesets/battle_tower_inside_collision.asm similarity index 100% rename from data/tilesets/battle_tower_collision.asm rename to data/tilesets/battle_tower_inside_collision.asm diff --git a/data/tilesets/battle_tower_metatiles.bin b/data/tilesets/battle_tower_inside_metatiles.bin similarity index 100% rename from data/tilesets/battle_tower_metatiles.bin rename to data/tilesets/battle_tower_inside_metatiles.bin 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) diff --git a/gfx/tileset_palette_maps.asm b/gfx/tileset_palette_maps.asm index 41f71ff0b..110e48941 100644 --- a/gfx/tileset_palette_maps.asm +++ b/gfx/tileset_palette_maps.asm @@ -103,8 +103,8 @@ INCLUDE "gfx/tilesets/forest_palette_map.asm" TilesetPokeComCenterPalMap: INCLUDE "gfx/tilesets/pokecom_center_palette_map.asm" -TilesetBattleTowerPalMap: -INCLUDE "gfx/tilesets/battle_tower_palette_map.asm" +TilesetBattleTowerInsidePalMap: +INCLUDE "gfx/tilesets/battle_tower_inside_palette_map.asm" TilesetBattleTowerOutsidePalMap: INCLUDE "gfx/tilesets/battle_tower_outside_palette_map.asm" diff --git a/gfx/tilesets.asm b/gfx/tilesets.asm index c4071349c..6cc4d7155 100644 --- a/gfx/tilesets.asm +++ b/gfx/tilesets.asm @@ -206,14 +206,14 @@ INCBIN "data/tilesets/pokecom_center_metatiles.bin" TilesetPokeComCenterColl: INCLUDE "data/tilesets/pokecom_center_collision.asm" -TilesetBattleTowerGFX: -INCBIN "gfx/tilesets/battle_tower.2bpp.lz" +TilesetBattleTowerInsideGFX: +INCBIN "gfx/tilesets/battle_tower_inside.2bpp.lz" -TilesetBattleTowerMeta: -INCBIN "data/tilesets/battle_tower_metatiles.bin" +TilesetBattleTowerInsideMeta: +INCBIN "data/tilesets/battle_tower_inside_metatiles.bin" -TilesetBattleTowerColl: -INCLUDE "data/tilesets/battle_tower_collision.asm" +TilesetBattleTowerInsideColl: +INCLUDE "data/tilesets/battle_tower_inside_collision.asm" TilesetGateGFX: INCBIN "gfx/tilesets/gate.2bpp.lz" diff --git a/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d b/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d similarity index 100% rename from gfx/tilesets/battle_tower.2bpp.lz.467b6a2d rename to gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d diff --git a/gfx/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower_inside.pal similarity index 100% rename from gfx/tilesets/battle_tower.pal rename to gfx/tilesets/battle_tower_inside.pal diff --git a/gfx/tilesets/battle_tower.png b/gfx/tilesets/battle_tower_inside.png similarity index 100% rename from gfx/tilesets/battle_tower.png rename to gfx/tilesets/battle_tower_inside.png diff --git a/gfx/tilesets/battle_tower_palette_map.asm b/gfx/tilesets/battle_tower_inside_palette_map.asm similarity index 100% rename from gfx/tilesets/battle_tower_palette_map.asm rename to gfx/tilesets/battle_tower_inside_palette_map.asm