summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/overworld.s24
-rw-r--r--data/event_scripts.s4
-rw-r--r--data/layouts/BattleColosseum_2P/border.bin (renamed from data/layouts/BattleColosseum2P/border.bin)0
-rw-r--r--data/layouts/BattleColosseum_2P/map.bin (renamed from data/layouts/BattleColosseum2P/map.bin)bin252 -> 252 bytes
-rw-r--r--data/layouts/BattleColosseum_4P/border.bin (renamed from data/layouts/BattleColosseum4P/border.bin)0
-rw-r--r--data/layouts/BattleColosseum_4P/map.bin (renamed from data/layouts/BattleColosseum4P/map.bin)bin252 -> 252 bytes
-rw-r--r--data/layouts/layouts.json12
-rw-r--r--data/maps/BattleColosseum2P/scripts.inc2
-rw-r--r--data/maps/BattleColosseum4P/scripts.inc2
-rw-r--r--data/maps/BattleColosseum_2P/map.json (renamed from data/maps/BattleColosseum2P/map.json)8
-rw-r--r--data/maps/BattleColosseum_2P/scripts.inc2
-rw-r--r--data/maps/BattleColosseum_4P/map.json (renamed from data/maps/BattleColosseum4P/map.json)10
-rw-r--r--data/maps/BattleColosseum_4P/scripts.inc2
-rw-r--r--data/maps/map_groups.json4
-rw-r--r--data/scripts/cable_club.inc24
15 files changed, 47 insertions, 47 deletions
diff --git a/asm/overworld.s b/asm/overworld.s
index fb746285f..3dbea1b1f 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -6837,16 +6837,16 @@ _08058122:
sub_805812C: @ 805812C
push {lr}
adds r1, r0, 0
- ldr r0, _08058178 @ =BattleColosseum4P_EventScript_PlayerSpot0
+ ldr r0, _08058178 @ =BattleColosseum_4P_EventScript_PlayerSpot0
cmp r1, r0
beq _08058172
- ldr r0, _0805817C @ =BattleColosseum4P_EventScript_PlayerSpot1
+ ldr r0, _0805817C @ =BattleColosseum_4P_EventScript_PlayerSpot1
cmp r1, r0
beq _080581B4
- ldr r0, _08058180 @ =BattleColosseum4P_EventScript_PlayerSpot2
+ ldr r0, _08058180 @ =BattleColosseum_4P_EventScript_PlayerSpot2
cmp r1, r0
beq _08058172
- ldr r0, _08058184 @ =BattleColosseum4P_EventScript_PlayerSpot3
+ ldr r0, _08058184 @ =BattleColosseum_4P_EventScript_PlayerSpot3
cmp r1, r0
beq _080581B4
ldr r0, _08058188 @ =RecordCenter_EventScript_Spot
@@ -6861,10 +6861,10 @@ sub_805812C: @ 805812C
ldr r0, _08058194 @ =RecordCenter_EventScript_Spot
cmp r1, r0
beq _080581B4
- ldr r0, _08058198 @ =BattleColosseum2P_EventScript_PlayerSpot0
+ ldr r0, _08058198 @ =BattleColosseum_2P_EventScript_PlayerSpot0
cmp r1, r0
beq _08058172
- ldr r0, _0805819C @ =BattleColosseum2P_EventScript_PlayerSpot1
+ ldr r0, _0805819C @ =BattleColosseum_2P_EventScript_PlayerSpot1
cmp r1, r0
beq _080581B4
ldr r0, _080581A0 @ =TradeCenter_EventScript_Chair0
@@ -6874,16 +6874,16 @@ _08058172:
movs r0, 0xA
b _080581B6
.align 2, 0
-_08058178: .4byte BattleColosseum4P_EventScript_PlayerSpot0
-_0805817C: .4byte BattleColosseum4P_EventScript_PlayerSpot1
-_08058180: .4byte BattleColosseum4P_EventScript_PlayerSpot2
-_08058184: .4byte BattleColosseum4P_EventScript_PlayerSpot3
+_08058178: .4byte BattleColosseum_4P_EventScript_PlayerSpot0
+_0805817C: .4byte BattleColosseum_4P_EventScript_PlayerSpot1
+_08058180: .4byte BattleColosseum_4P_EventScript_PlayerSpot2
+_08058184: .4byte BattleColosseum_4P_EventScript_PlayerSpot3
_08058188: .4byte RecordCenter_EventScript_Spot
_0805818C: .4byte RecordCenter_EventScript_Spot
_08058190: .4byte RecordCenter_EventScript_Spot
_08058194: .4byte RecordCenter_EventScript_Spot
-_08058198: .4byte BattleColosseum2P_EventScript_PlayerSpot0
-_0805819C: .4byte BattleColosseum2P_EventScript_PlayerSpot1
+_08058198: .4byte BattleColosseum_2P_EventScript_PlayerSpot0
+_0805819C: .4byte BattleColosseum_2P_EventScript_PlayerSpot1
_080581A0: .4byte TradeCenter_EventScript_Chair0
_080581A4:
ldr r0, _080581B0 @ =TradeCenter_EventScript_Chair1
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 5e0a0dc8c..6096e9c57 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -74,10 +74,10 @@ gStdScripts:: @ 8160450
.4byte Std_ReceivedItem
gStdScriptsEnd::
- .include "data/maps/BattleColosseum2P/scripts.inc"
+ .include "data/maps/BattleColosseum_2P/scripts.inc"
.include "data/maps/TradeCenter/scripts.inc"
.include "data/maps/RecordCenter/scripts.inc"
- .include "data/maps/BattleColosseum4P/scripts.inc"
+ .include "data/maps/BattleColosseum_4P/scripts.inc"
.include "data/maps/UnionRoom/scripts.inc"
.include "data/maps/ViridianForest/scripts.inc"
.include "data/maps/MtMoon_1F/scripts.inc"
diff --git a/data/layouts/BattleColosseum2P/border.bin b/data/layouts/BattleColosseum_2P/border.bin
index efef023e6..efef023e6 100644
--- a/data/layouts/BattleColosseum2P/border.bin
+++ b/data/layouts/BattleColosseum_2P/border.bin
diff --git a/data/layouts/BattleColosseum2P/map.bin b/data/layouts/BattleColosseum_2P/map.bin
index 8616a5f1b..8616a5f1b 100644
--- a/data/layouts/BattleColosseum2P/map.bin
+++ b/data/layouts/BattleColosseum_2P/map.bin
Binary files differ
diff --git a/data/layouts/BattleColosseum4P/border.bin b/data/layouts/BattleColosseum_4P/border.bin
index efef023e6..efef023e6 100644
--- a/data/layouts/BattleColosseum4P/border.bin
+++ b/data/layouts/BattleColosseum_4P/border.bin
diff --git a/data/layouts/BattleColosseum4P/map.bin b/data/layouts/BattleColosseum_4P/map.bin
index c68e13ec3..c68e13ec3 100644
--- a/data/layouts/BattleColosseum4P/map.bin
+++ b/data/layouts/BattleColosseum_4P/map.bin
Binary files differ
diff --git a/data/layouts/layouts.json b/data/layouts/layouts.json
index 6a9b024bd..04727aaa7 100644
--- a/data/layouts/layouts.json
+++ b/data/layouts/layouts.json
@@ -434,15 +434,15 @@
},
{
"id": "LAYOUT_BATTLE_COLOSSEUM_2P",
- "name": "BattleColosseum2P_Layout",
+ "name": "BattleColosseum_2P_Layout",
"width": 14,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44",
- "border_filepath": "data/layouts/BattleColosseum2P/border.bin",
- "blockdata_filepath": "data/layouts/BattleColosseum2P/map.bin"
+ "border_filepath": "data/layouts/BattleColosseum_2P/border.bin",
+ "blockdata_filepath": "data/layouts/BattleColosseum_2P/map.bin"
},
{
"id": "LAYOUT_TRADE_CENTER",
@@ -470,15 +470,15 @@
},
{
"id": "LAYOUT_BATTLE_COLOSSEUM_4P",
- "name": "BattleColosseum4P_Layout",
+ "name": "BattleColosseum_4P_Layout",
"width": 14,
"height": 9,
"border_width": 2,
"border_height": 2,
"primary_tileset": "gTileset_82D4BB4",
"secondary_tileset": "gTileset_82D4C44",
- "border_filepath": "data/layouts/BattleColosseum4P/border.bin",
- "blockdata_filepath": "data/layouts/BattleColosseum4P/map.bin"
+ "border_filepath": "data/layouts/BattleColosseum_4P/border.bin",
+ "blockdata_filepath": "data/layouts/BattleColosseum_4P/map.bin"
},
{
"id": "LAYOUT_FUCHSIA_CITY_SAFARI_ZONE_ENTRANCE",
diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc
deleted file mode 100644
index 59a5b3754..000000000
--- a/data/maps/BattleColosseum2P/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-BattleColosseum2P_MapScripts:: @ 8160478
- .byte 0
diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc
deleted file mode 100644
index 918c093d0..000000000
--- a/data/maps/BattleColosseum4P/scripts.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-BattleColosseum4P_MapScripts:: @ 816047B
- .byte 0
diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum_2P/map.json
index e1eaed672..bd1e8ca3e 100644
--- a/data/maps/BattleColosseum2P/map.json
+++ b/data/maps/BattleColosseum_2P/map.json
@@ -1,6 +1,6 @@
{
"id": "MAP_BATTLE_COLOSSEUM_2P",
- "name": "BattleColosseum2P",
+ "name": "BattleColosseum_2P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_2P",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_SPECIAL_AREA",
@@ -23,7 +23,7 @@
"movement_range_y": 0,
"trainer_type": 0,
"trainer_sight_or_berry_tree_id": 0,
- "script": "BattleColosseum2P_EventScript_Attendant",
+ "script": "BattleColosseum_2P_EventScript_Attendant",
"flag": "0"
}
],
@@ -51,7 +51,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "BattleColosseum2P_EventScript_PlayerSpot0"
+ "script": "BattleColosseum_2P_EventScript_PlayerSpot0"
},
{
"type": "trigger",
@@ -60,7 +60,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "BattleColosseum2P_EventScript_PlayerSpot1"
+ "script": "BattleColosseum_2P_EventScript_PlayerSpot1"
}
],
"bg_events": []
diff --git a/data/maps/BattleColosseum_2P/scripts.inc b/data/maps/BattleColosseum_2P/scripts.inc
new file mode 100644
index 000000000..52eb16728
--- /dev/null
+++ b/data/maps/BattleColosseum_2P/scripts.inc
@@ -0,0 +1,2 @@
+BattleColosseum_2P_MapScripts:: @ 8160478
+ .byte 0
diff --git a/data/maps/BattleColosseum4P/map.json b/data/maps/BattleColosseum_4P/map.json
index d385ca315..53bdf260b 100644
--- a/data/maps/BattleColosseum4P/map.json
+++ b/data/maps/BattleColosseum_4P/map.json
@@ -1,6 +1,6 @@
{
"id": "MAP_BATTLE_COLOSSEUM_4P",
- "name": "BattleColosseum4P",
+ "name": "BattleColosseum_4P",
"layout": "LAYOUT_BATTLE_COLOSSEUM_4P",
"music": "MUS_POKECEN",
"region_map_section": "MAPSEC_SPECIAL_AREA",
@@ -51,7 +51,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "BattleColosseum4P_EventScript_PlayerSpot0"
+ "script": "BattleColosseum_4P_EventScript_PlayerSpot0"
},
{
"type": "trigger",
@@ -60,7 +60,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "BattleColosseum4P_EventScript_PlayerSpot2"
+ "script": "BattleColosseum_4P_EventScript_PlayerSpot2"
},
{
"type": "trigger",
@@ -69,7 +69,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "BattleColosseum4P_EventScript_PlayerSpot1"
+ "script": "BattleColosseum_4P_EventScript_PlayerSpot1"
},
{
"type": "trigger",
@@ -78,7 +78,7 @@
"elevation": 3,
"var": "VAR_TEMP_0",
"var_value": 0,
- "script": "BattleColosseum4P_EventScript_PlayerSpot3"
+ "script": "BattleColosseum_4P_EventScript_PlayerSpot3"
}
],
"bg_events": []
diff --git a/data/maps/BattleColosseum_4P/scripts.inc b/data/maps/BattleColosseum_4P/scripts.inc
new file mode 100644
index 000000000..94053d6bf
--- /dev/null
+++ b/data/maps/BattleColosseum_4P/scripts.inc
@@ -0,0 +1,2 @@
+BattleColosseum_4P_MapScripts:: @ 816047B
+ .byte 0
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 0ff365eae..b89b112a4 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -45,10 +45,10 @@
"gMapGroup42"
],
"gMapGroup0": [
- "BattleColosseum2P",
+ "BattleColosseum_2P",
"TradeCenter",
"RecordCenter",
- "BattleColosseum4P",
+ "BattleColosseum_4P",
"UnionRoom"
],
"gMapGroup1": [
diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc
index f4d0ed6e1..f51720a7f 100644
--- a/data/scripts/cable_club.inc
+++ b/data/scripts/cable_club.inc
@@ -610,69 +610,69 @@ CableClub_EventScript_ShowBattleRecords:: @ 81BB8A7
releaseall
end
-BattleColosseum2P_EventScript_PlayerSpot0:: @ 81BB8C3
+BattleColosseum_2P_EventScript_PlayerSpot0:: @ 81BB8C3
setvar VAR_0x8005, 0
textcolor 3
special EnterColosseumPlayerSpot
waitstate
end
-BattleColosseum2P_EventScript_PlayerSpot1:: @ 81BB8CF
+BattleColosseum_2P_EventScript_PlayerSpot1:: @ 81BB8CF
setvar VAR_0x8005, 1
textcolor 3
special EnterColosseumPlayerSpot
waitstate
end
-BattleColosseum4P_EventScript_PlayerSpot0:: @ 81BB8DB
+BattleColosseum_4P_EventScript_PlayerSpot0:: @ 81BB8DB
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger
+ goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
setvar VAR_0x8005, 0
textcolor 3
special EnterColosseumPlayerSpot
waitstate
end
-BattleColosseum4P_EventScript_PlayerSpot1:: @ 81BB8F8
+BattleColosseum_4P_EventScript_PlayerSpot1:: @ 81BB8F8
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger
+ goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
setvar VAR_0x8005, 1
textcolor 3
special EnterColosseumPlayerSpot
waitstate
end
-BattleColosseum4P_EventScript_PlayerSpot2:: @ 81BB915
+BattleColosseum_4P_EventScript_PlayerSpot2:: @ 81BB915
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger
+ goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
setvar VAR_0x8005, 2
textcolor 3
special EnterColosseumPlayerSpot
waitstate
end
-BattleColosseum4P_EventScript_PlayerSpot3:: @ 81BB932
+BattleColosseum_4P_EventScript_PlayerSpot3:: @ 81BB932
fadescreen FADE_TO_BLACK
special ChooseHalfPartyForBattle
waitstate
compare VAR_RESULT, 0
- goto_if_eq BattleColosseum4P_EventScript_CancelSpotTrigger
+ goto_if_eq BattleColosseum_4P_EventScript_CancelSpotTrigger
setvar VAR_0x8005, 3
textcolor 3
special EnterColosseumPlayerSpot
waitstate
end
-BattleColosseum4P_EventScript_CancelSpotTrigger:: @ 81BB94F
+BattleColosseum_4P_EventScript_CancelSpotTrigger:: @ 81BB94F
end
TradeCenter_EventScript_Chair0:: @ 81BB950
@@ -731,7 +731,7 @@ CableClub_EventScript_TooBusyToNotice:: @ 81BB9A3
closemessage
end
-BattleColosseum2P_EventScript_Attendant:: @ 81BB9AF
+BattleColosseum_2P_EventScript_Attendant:: @ 81BB9AF
textcolor 3
special Script_FacePlayer
msgbox Text_TakeSeatStartBattle
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 17:34:02 +0000