From 35ed8de51b0784e44560237248fc516f96e835df Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 7 Nov 2019 12:37:11 -0500 Subject: Fix Battle Colosseum names --- data/maps/BattleColosseum2P/map.json | 68 +++++++++++++++++++++++ data/maps/BattleColosseum2P/scripts.inc | 3 + data/maps/BattleColosseum4P/map.json | 86 +++++++++++++++++++++++++++++ data/maps/BattleColosseum4P/scripts.inc | 3 + data/maps/DoubleBattleColosseum/map.json | 86 ----------------------------- data/maps/DoubleBattleColosseum/scripts.inc | 3 - data/maps/SingleBattleColosseum/map.json | 68 ----------------------- data/maps/SingleBattleColosseum/scripts.inc | 3 - data/maps/map_groups.json | 4 +- 9 files changed, 162 insertions(+), 162 deletions(-) create mode 100644 data/maps/BattleColosseum2P/map.json create mode 100644 data/maps/BattleColosseum2P/scripts.inc create mode 100644 data/maps/BattleColosseum4P/map.json create mode 100644 data/maps/BattleColosseum4P/scripts.inc delete mode 100644 data/maps/DoubleBattleColosseum/map.json delete mode 100644 data/maps/DoubleBattleColosseum/scripts.inc delete mode 100644 data/maps/SingleBattleColosseum/map.json delete mode 100644 data/maps/SingleBattleColosseum/scripts.inc (limited to 'data/maps') diff --git a/data/maps/BattleColosseum2P/map.json b/data/maps/BattleColosseum2P/map.json new file mode 100644 index 000000000..18df18491 --- /dev/null +++ b/data/maps/BattleColosseum2P/map.json @@ -0,0 +1,68 @@ +{ + "id": "MAP_BATTLE_COLOSSEUM_2P", + "name": "BattleColosseum2P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_2P", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [ + { + "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", + "x": 9, + "y": 3, + "elevation": 3, + "movement_type": "MOVEMENT_TYPE_FACE_LEFT", + "movement_range_x": 0, + "movement_range_y": 0, + "trainer_type": "0", + "trainer_sight_or_berry_tree_id": "0", + "script": "BattleColosseum2P_EventScript_Attendant", + "flag": "0" + } + ], + "warp_events": [ + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "EventScript_BattleColosseum2P_PlayerSpot0" + }, + { + "type": "trigger", + "x": 10, + "y": 5, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "EventScript_BattleColosseum2P_PlayerSpot1" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleColosseum2P/scripts.inc b/data/maps/BattleColosseum2P/scripts.inc new file mode 100644 index 000000000..efa01af6c --- /dev/null +++ b/data/maps/BattleColosseum2P/scripts.inc @@ -0,0 +1,3 @@ +BattleColosseum2P_MapScripts:: @ 823B77D + .byte 0 + diff --git a/data/maps/BattleColosseum4P/map.json b/data/maps/BattleColosseum4P/map.json new file mode 100644 index 000000000..d17851aaf --- /dev/null +++ b/data/maps/BattleColosseum4P/map.json @@ -0,0 +1,86 @@ +{ + "id": "MAP_BATTLE_COLOSSEUM_4P", + "name": "BattleColosseum4P", + "layout": "LAYOUT_BATTLE_COLOSSEUM_4P", + "music": "MUS_RAINBOW", + "region_map_section": "MAPSEC_DYNAMIC", + "requires_flash": false, + "weather": "WEATHER_NONE", + "map_type": "MAP_TYPE_INDOOR", + "allow_bike": false, + "allow_escape_rope": false, + "allow_running": false, + "show_map_name": false, + "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", + "connections": null, + "object_events": [], + "warp_events": [ + { + "x": 5, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 6, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 7, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + }, + { + "x": 8, + "y": 8, + "elevation": 3, + "dest_map": "MAP_NONE", + "dest_warp_id": 127 + } + ], + "coord_events": [ + { + "type": "trigger", + "x": 3, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "EventScript_BattleColosseum4P_PlayerSpot0" + }, + { + "type": "trigger", + "x": 3, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "EventScript_BattleColosseum4P_PlayerSpot2" + }, + { + "type": "trigger", + "x": 10, + "y": 4, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "EventScript_BattleColosseum4P_PlayerSpot1" + }, + { + "type": "trigger", + "x": 10, + "y": 6, + "elevation": 3, + "var": "VAR_TEMP_0", + "var_value": "0", + "script": "EventScript_BattleColosseum4P_PlayerSpot3" + } + ], + "bg_events": [] +} \ No newline at end of file diff --git a/data/maps/BattleColosseum4P/scripts.inc b/data/maps/BattleColosseum4P/scripts.inc new file mode 100644 index 000000000..b1733aecd --- /dev/null +++ b/data/maps/BattleColosseum4P/scripts.inc @@ -0,0 +1,3 @@ +BattleColosseum4P_MapScripts:: @ 823B780 + .byte 0 + diff --git a/data/maps/DoubleBattleColosseum/map.json b/data/maps/DoubleBattleColosseum/map.json deleted file mode 100644 index 172bb3fdc..000000000 --- a/data/maps/DoubleBattleColosseum/map.json +++ /dev/null @@ -1,86 +0,0 @@ -{ - "id": "MAP_DOUBLE_BATTLE_COLOSSEUM", - "name": "DoubleBattleColosseum", - "layout": "LAYOUT_DOUBLE_BATTLE_COLOSSEUM", - "music": "MUS_RAINBOW", - "region_map_section": "MAPSEC_DYNAMIC", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, - "allow_running": false, - "show_map_name": false, - "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", - "connections": null, - "object_events": [], - "warp_events": [ - { - "x": 5, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 6, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 7, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 8, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 3, - "y": 4, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "EventScript_DoubleBattleColosseum_PlayerSpot0" - }, - { - "type": "trigger", - "x": 3, - "y": 6, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "EventScript_DoubleBattleColosseum_PlayerSpot2" - }, - { - "type": "trigger", - "x": 10, - "y": 4, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "EventScript_DoubleBattleColosseum_PlayerSpot1" - }, - { - "type": "trigger", - "x": 10, - "y": 6, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "EventScript_DoubleBattleColosseum_PlayerSpot3" - } - ], - "bg_events": [] -} \ No newline at end of file diff --git a/data/maps/DoubleBattleColosseum/scripts.inc b/data/maps/DoubleBattleColosseum/scripts.inc deleted file mode 100644 index ac64377ae..000000000 --- a/data/maps/DoubleBattleColosseum/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -DoubleBattleColosseum_MapScripts:: @ 823B780 - .byte 0 - diff --git a/data/maps/SingleBattleColosseum/map.json b/data/maps/SingleBattleColosseum/map.json deleted file mode 100644 index f63464424..000000000 --- a/data/maps/SingleBattleColosseum/map.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "id": "MAP_SINGLE_BATTLE_COLOSSEUM", - "name": "SingleBattleColosseum", - "layout": "LAYOUT_SINGLE_BATTLE_COLOSSEUM", - "music": "MUS_RAINBOW", - "region_map_section": "MAPSEC_DYNAMIC", - "requires_flash": false, - "weather": "WEATHER_NONE", - "map_type": "MAP_TYPE_INDOOR", - "allow_bike": false, - "allow_escape_rope": false, - "allow_running": false, - "show_map_name": false, - "battle_scene": "MAP_BATTLE_SCENE_FRONTIER", - "connections": null, - "object_events": [ - { - "graphics_id": "EVENT_OBJ_GFX_LINK_RECEPTIONIST", - "x": 9, - "y": 3, - "elevation": 3, - "movement_type": "MOVEMENT_TYPE_FACE_LEFT", - "movement_range_x": 0, - "movement_range_y": 0, - "trainer_type": "0", - "trainer_sight_or_berry_tree_id": "0", - "script": "SingleBattleColosseum_EventScript_Attendant", - "flag": "0" - } - ], - "warp_events": [ - { - "x": 6, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - }, - { - "x": 7, - "y": 8, - "elevation": 3, - "dest_map": "MAP_NONE", - "dest_warp_id": 127 - } - ], - "coord_events": [ - { - "type": "trigger", - "x": 3, - "y": 5, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "EventScript_SingleBattleColosseum_PlayerSpot0" - }, - { - "type": "trigger", - "x": 10, - "y": 5, - "elevation": 3, - "var": "VAR_TEMP_0", - "var_value": "0", - "script": "EventScript_SingleBattleColosseum_PlayerSpot1" - } - ], - "bg_events": [] -} \ No newline at end of file diff --git a/data/maps/SingleBattleColosseum/scripts.inc b/data/maps/SingleBattleColosseum/scripts.inc deleted file mode 100644 index 06ed3ef16..000000000 --- a/data/maps/SingleBattleColosseum/scripts.inc +++ /dev/null @@ -1,3 +0,0 @@ -SingleBattleColosseum_MapScripts:: @ 823B77D - .byte 0 - diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 7b78a80db..74746e0c4 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -456,10 +456,10 @@ "SecretBase_YellowCave4", "SecretBase_Tree4", "SecretBase_Shrub4", - "SingleBattleColosseum", + "BattleColosseum2P", "TradeCenter", "RecordCorner", - "DoubleBattleColosseum", + "BattleColosseum4P", "LinkContestRoom1", "UnknownLinkContestRoom_25_29", "UnknownLinkContestRoom_25_30", -- cgit v1.2.3