summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--constants/tileset_constants.asm2
-rw-r--r--data/maps/maps.asm8
-rw-r--r--data/tilesets.asm2
-rw-r--r--data/tilesets/battle_tower_inside_collision.asm (renamed from data/tilesets/battle_tower_collision.asm)0
-rw-r--r--data/tilesets/battle_tower_inside_metatiles.bin (renamed from data/tilesets/battle_tower_metatiles.bin)bin1024 -> 1024 bytes
-rw-r--r--engine/tilesets/tileset_anims.asm2
-rw-r--r--engine/tilesets/tileset_palettes.asm28
-rw-r--r--gfx/tileset_palette_maps.asm4
-rw-r--r--gfx/tilesets.asm12
-rw-r--r--gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d (renamed from gfx/tilesets/battle_tower.2bpp.lz.467b6a2d)bin832 -> 832 bytes
-rw-r--r--gfx/tilesets/battle_tower_inside.pal (renamed from gfx/tilesets/battle_tower.pal)0
-rw-r--r--gfx/tilesets/battle_tower_inside.png (renamed from gfx/tilesets/battle_tower.png)bin1004 -> 1004 bytes
-rw-r--r--gfx/tilesets/battle_tower_inside_palette_map.asm (renamed from gfx/tilesets/battle_tower_palette_map.asm)0
13 files changed, 29 insertions, 29 deletions
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
index 97e09bf5d..97e09bf5d 100644
--- a/data/tilesets/battle_tower_collision.asm
+++ b/data/tilesets/battle_tower_inside_collision.asm
diff --git a/data/tilesets/battle_tower_metatiles.bin b/data/tilesets/battle_tower_inside_metatiles.bin
index c64ef0a12..c64ef0a12 100644
--- a/data/tilesets/battle_tower_metatiles.bin
+++ b/data/tilesets/battle_tower_inside_metatiles.bin
Binary files differ
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
index fa5d0a9f0..fa5d0a9f0 100644
--- a/gfx/tilesets/battle_tower.2bpp.lz.467b6a2d
+++ b/gfx/tilesets/battle_tower_inside.2bpp.lz.467b6a2d
Binary files differ
diff --git a/gfx/tilesets/battle_tower.pal b/gfx/tilesets/battle_tower_inside.pal
index 4e71a5575..4e71a5575 100644
--- a/gfx/tilesets/battle_tower.pal
+++ b/gfx/tilesets/battle_tower_inside.pal
diff --git a/gfx/tilesets/battle_tower.png b/gfx/tilesets/battle_tower_inside.png
index cf9e12d53..cf9e12d53 100644
--- a/gfx/tilesets/battle_tower.png
+++ b/gfx/tilesets/battle_tower_inside.png
Binary files differ
diff --git a/gfx/tilesets/battle_tower_palette_map.asm b/gfx/tilesets/battle_tower_inside_palette_map.asm
index 1abce2a16..1abce2a16 100644
--- a/gfx/tilesets/battle_tower_palette_map.asm
+++ b/gfx/tilesets/battle_tower_inside_palette_map.asm
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 11:11:37 +0000