Swap trade center and battle center

also rename battle center to colosseum
closes https://github.com/iimarckus/pokered/issues/102

11 files changed, 36 insertions, 36 deletions

diff --git a/data/hidden_objects.asm b/data/hidden_objects.asm
index 0e36dbc4..8170cf5a 100755
--- a/data/hidden_objects.asm
+++ b/data/hidden_objects.asm
@@ -28,8 +28,8 @@ HiddenObjectMaps: ; 46a40 (11:6a40)
 	db SAFFRON_GYM
 	db MT_MOON_POKECENTER
 	db ROCK_TUNNEL_POKECENTER
-	db BATTLE_CENTER
 	db TRADE_CENTER
+	db COLOSSEUM
 	db VIRIDIAN_FOREST
 	db MT_MOON_3
 	db INDIGO_PLATEAU
@@ -117,8 +117,8 @@ HiddenObjectPointers: ; 46a96 (11:6a96)
 	dw SaffronGymHiddenObjects
 	dw MtMoonPokecenterHiddenObjects
 	dw RockTunnelPokecenterHiddenObjects
-	dw BattleCenterHiddenObjects
 	dw TradeCenterHiddenObjects
+	dw ColosseumHiddenObjects
 	dw ViridianForestHiddenObjects
 	dw MtMoon3HiddenObjects
 	dw IndigoPlateauHiddenObjects
@@ -175,7 +175,7 @@ HiddenObjectPointers: ; 46a96 (11:6a96)
 	dw Route4HiddenObjects
 
 ; format: y-coord, x-coord, text id/item id, object routine
-BattleCenterHiddenObjects: ; 46b40 (11:6b40)
+TradeCenterHiddenObjects: ; 46b40 (11:6b40)
 	db $04,$05,$d0
 	db BANK(CableClubRightGameboy)
 	dw CableClubRightGameboy
@@ -183,7 +183,7 @@ BattleCenterHiddenObjects: ; 46b40 (11:6b40)
 	db BANK(CableClubLeftGameboy)
 	dw CableClubLeftGameboy
 	db $FF
-TradeCenterHiddenObjects: ; 46b4d (11:6b4d)
+ColosseumHiddenObjects: ; 46b4d (11:6b4d)
 	db $04,$05,$d0
 	db BANK(CableClubRightGameboy)
 	dw CableClubRightGameboy
diff --git a/data/mapHeaders/battlecenterm.asm b/data/mapHeaders/battlecenterm.asm
deleted file mode 100755
index 984f7e38..00000000
--- a/data/mapHeaders/battlecenterm.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-BattleCenterM_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
-	db CLUB ; tileset
-	db BATTLE_CENTER_HEIGHT, BATTLE_CENTER_WIDTH ; dimensions (y, x)
-	dw BattleCenterMBlocks, BattleCenterMTextPointers, BattleCenterMScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw BattleCenterMObject ; objects
diff --git a/data/mapHeaders/colosseum.asm b/data/mapHeaders/colosseum.asm
new file mode 100755
index 00000000..94728b8d
--- /dev/null
+++ b/data/mapHeaders/colosseum.asm
@@ -0,0 +1,6 @@
+Colosseum_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
+	db CLUB ; tileset
+	db COLOSSEUM_HEIGHT, COLOSSEUM_WIDTH ; dimensions (y, x)
+	dw ColosseumBlocks, ColosseumTextPointers, ColosseumScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw ColosseumObject ; objects
diff --git a/data/mapHeaders/tradecenter.asm b/data/mapHeaders/tradecenter.asm
new file mode 100755
index 00000000..b9759bbb
--- /dev/null
+++ b/data/mapHeaders/tradecenter.asm
@@ -0,0 +1,6 @@
+TradeCenter_h: ; 0x4fd04 to 0x4fd10 (12 bytes) (id=239)
+	db CLUB ; tileset
+	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
+	dw TradeCenterBlocks, TradeCenterTextPointers, TradeCenterScript ; blocks, texts, scripts
+	db $00 ; connections
+	dw TradeCenterObject ; objects
diff --git a/data/mapHeaders/tradecenterm.asm b/data/mapHeaders/tradecenterm.asm
deleted file mode 100755
index 59eb5095..00000000
--- a/data/mapHeaders/tradecenterm.asm
+++ /dev/null
@@ -1,6 +0,0 @@
-TradeCenterM_h: ; 0x4fd71 to 0x4fd7d (12 bytes) (id=240)
-	db CLUB ; tileset
-	db TRADE_CENTER_HEIGHT, TRADE_CENTER_WIDTH ; dimensions (y, x)
-	dw TradeCenterMBlocks, TradeCenterMTextPointers, TradeCenterMScript ; blocks, texts, scripts
-	db $00 ; connections
-	dw TradeCenterMObject ; objects
diff --git a/data/mapObjects/tradecenterm.asm b/data/mapObjects/colosseum.asm
index 104b9c0b..300dd75a 100755
--- a/data/mapObjects/tradecenterm.asm
+++ b/data/mapObjects/colosseum.asm
@@ -1,4 +1,4 @@
-TradeCenterMObject: ; 0x4fd87 (size=10)
+ColosseumObject: ; 0x4fd87 (size=10)
 	db $e ; border block
 
 	db $0 ; warps
diff --git a/data/mapObjects/battlecenterm.asm b/data/mapObjects/tradecenter.asm
index 45d88590..3afdf48e 100755
--- a/data/mapObjects/battlecenterm.asm
+++ b/data/mapObjects/tradecenter.asm
@@ -1,4 +1,4 @@
-BattleCenterMObject: ; 0x4fd53 (size=10)
+TradeCenterObject: ; 0x4fd53 (size=10)
 	db $e ; border block
 
 	db $0 ; warps
diff --git a/data/map_header_banks.asm b/data/map_header_banks.asm
index f6bd8d99..ed120d75 100755
--- a/data/map_header_banks.asm
+++ b/data/map_header_banks.asm
@@ -239,8 +239,8 @@ MapHeaderBanks: ; c23d (3:423d)
 	db BANK(SilphCoElevator_h)
 	db $11
 	db $11
-	db BANK(BattleCenterM_h)
-	db BANK(TradeCenterM_h)
+	db BANK(TradeCenter_h)
+	db BANK(Colosseum_h)
 	db $11
 	db $11
 	db $11
diff --git a/data/map_header_pointers.asm b/data/map_header_pointers.asm
index 771989a5..ef2b4e65 100755
--- a/data/map_header_pointers.asm
+++ b/data/map_header_pointers.asm
@@ -239,8 +239,8 @@ MapHeaderPointers:: ; 01ae (0:01ae)
 	dw SilphCoElevator_h
 	dw SilphCo2_h ; unused
 	dw SilphCo2_h ; unused
-	dw BattleCenterM_h
-	dw TradeCenterM_h
+	dw TradeCenter_h
+	dw Colosseum_h
 	dw SilphCo2_h ; unused
 	dw SilphCo2_h ; unused
 	dw SilphCo2_h ; unused
diff --git a/data/map_songs.asm b/data/map_songs.asm
index 1d7ab269..a8022da2 100755
--- a/data/map_songs.asm
+++ b/data/map_songs.asm
@@ -238,8 +238,8 @@ MapSongBanks: ; c04d (3:404d)
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo) ; SilphCoElevator
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
-	db MUSIC_CELADON, BANK(Music_Celadon) ; BattleCenterM
-	db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenterM
+	db MUSIC_CELADON, BANK(Music_Celadon) ; TradeCenter
+	db MUSIC_CELADON, BANK(Music_Celadon) ; Colosseum
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
 	db MUSIC_SILPH_CO, BANK(Music_SilphCo)
diff --git a/data/special_warps.asm b/data/special_warps.asm
index 480bac89..b8baccfb 100755
--- a/data/special_warps.asm
+++ b/data/special_warps.asm
@@ -39,26 +39,26 @@ FirstMapSpec: ; 6420 (1:6420)
 	FLYWARP_DATA REDS_HOUSE_2F_WIDTH,6,3
 	db REDS_HOUSE_2
 
-BattleCenterSpec1: ; 6428 (1:6428)
-	db BATTLE_CENTER
-	FLYWARP_DATA BATTLE_CENTER_WIDTH,4,3
-	db CLUB
-
-BattleCenterSpec2: ; 6430 (1:6430)
-	db BATTLE_CENTER
-	FLYWARP_DATA BATTLE_CENTER_WIDTH,4,6
-	db CLUB
-
-TradeCenterSpec1: ; 6438 (1:6438)
+TradeCenterSpec1: ; 6428 (1:6428)
 	db TRADE_CENTER
 	FLYWARP_DATA TRADE_CENTER_WIDTH,4,3
 	db CLUB
 
-TradeCenterSpec2: ; 6440 (1:6440)
+TradeCenterSpec2: ; 6430 (1:6430)
 	db TRADE_CENTER
 	FLYWARP_DATA TRADE_CENTER_WIDTH,4,6
 	db CLUB
 
+ColosseumSpec1: ; 6438 (1:6438)
+	db COLOSSEUM
+	FLYWARP_DATA COLOSSEUM_WIDTH,4,3
+	db CLUB
+
+ColosseumSpec2: ; 6440 (1:6440)
+	db COLOSSEUM
+	FLYWARP_DATA COLOSSEUM_WIDTH,4,6
+	db CLUB
+
 FlyWarpDataPtr: ; 6448 (1:6448)
 	db PALLET_TOWN, 0
 	dw PalletTownFlyWarp