diff options
Diffstat (limited to 'data/maps')
-rw-r--r-- | data/maps/BattleColosseum2P/scripts.inc | 3 | ||||
-rw-r--r-- | data/maps/BattleColosseum4P/scripts.inc | 3 | ||||
-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.inc | 3 | ||||
-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.inc | 3 | ||||
-rw-r--r-- | data/maps/map_groups.json | 4 |
7 files changed, 17 insertions, 17 deletions
diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc deleted file mode 100644 index efa01af6c..000000000 --- a/data/maps/BattleColosseum2P/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -BattleColosseum2P_MapScripts:: @ 823B77D - .byte 0 - diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc deleted file mode 100644 index b1733aecd..000000000 --- a/data/maps/BattleColosseum4P/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -BattleColosseum4P_MapScripts:: @ 823B780 - .byte 0 - diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum_2P/map.json index 18df18491..282be1e5c 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_RAINBOW", "region_map_section": "MAPSEC_DYNAMIC", @@ -24,7 +24,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" } ], @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_BattleColosseum2P_PlayerSpot0" + "script": "EventScript_BattleColosseum_2P_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_BattleColosseum2P_PlayerSpot1" + "script": "EventScript_BattleColosseum_2P_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..97c6a5d0b --- /dev/null +++ b/data/maps/BattleColosseum_2P/scripts.inc @@ -0,0 +1,3 @@ +BattleColosseum_2P_MapScripts:: @ 823B77D + .byte 0 + diff --git a/data/maps/BattleColosseum4P/map.json b/data/maps/BattleColosseum_4P/map.json index d17851aaf..2b849cfc1 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_RAINBOW", "region_map_section": "MAPSEC_DYNAMIC", @@ -52,7 +52,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_BattleColosseum4P_PlayerSpot0" + "script": "EventScript_BattleColosseum_4P_PlayerSpot0" }, { "type": "trigger", @@ -61,7 +61,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_BattleColosseum4P_PlayerSpot2" + "script": "EventScript_BattleColosseum_4P_PlayerSpot2" }, { "type": "trigger", @@ -70,7 +70,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_BattleColosseum4P_PlayerSpot1" + "script": "EventScript_BattleColosseum_4P_PlayerSpot1" }, { "type": "trigger", @@ -79,7 +79,7 @@ "elevation": 3, "var": "VAR_TEMP_0", "var_value": "0", - "script": "EventScript_BattleColosseum4P_PlayerSpot3" + "script": "EventScript_BattleColosseum_4P_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..70dca8e27 --- /dev/null +++ b/data/maps/BattleColosseum_4P/scripts.inc @@ -0,0 +1,3 @@ +BattleColosseum_4P_MapScripts:: @ 823B780 + .byte 0 + diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 0a62eb0ea..0a5ee32cf 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -456,10 +456,10 @@ "SecretBase_YellowCave4", "SecretBase_Tree4", "SecretBase_Shrub4", - "BattleColosseum2P", + "BattleColosseum_2P", "TradeCenter", "RecordCorner", - "BattleColosseum4P", + "BattleColosseum_4P", "ContestHall", "UnknownLinkContestRoom_25_29", "UnknownLinkContestRoom_25_30", |