From 6f1d2b870c1426e7f405f3b3bc4ff2b9edb380e1 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 9 Feb 2019 09:57:30 -0600 Subject: Give proper names to dynamic map layouts --- .../maps/LittlerootTown_ProfessorBirchsLab/scripts.inc | 4 ++-- data/maps/Route130/scripts.inc | 2 +- data/maps/Route131/scripts.inc | 2 +- data/maps/SkyPillar_1F/scripts.inc | 2 +- data/maps/SkyPillar_2F/scripts.inc | 2 +- data/maps/SkyPillar_3F/scripts.inc | 2 +- data/maps/SkyPillar_4F/scripts.inc | 2 +- data/maps/SkyPillar_5F/scripts.inc | 2 +- data/maps/SkyPillar_Top/scripts.inc | 2 +- data/maps/SootopolisCity/scripts.inc | 2 +- .../SootopolisCity_MysteryEventsHouse_1F/scripts.inc | 2 +- data/maps/UnknownLinkContestRoom_25_29/map.json | 18 ++++++++++++++++++ data/maps/UnknownLinkContestRoom_25_29/scripts.inc | 1 + data/maps/UnknownLinkContestRoom_25_30/map.json | 18 ++++++++++++++++++ data/maps/UnknownLinkContestRoom_25_30/scripts.inc | 1 + data/maps/UnknownLinkContestRoom_25_31/map.json | 18 ++++++++++++++++++ data/maps/UnknownLinkContestRoom_25_31/scripts.inc | 1 + data/maps/UnknownLinkContestRoom_25_32/map.json | 18 ++++++++++++++++++ data/maps/UnknownLinkContestRoom_25_32/scripts.inc | 1 + data/maps/UnknownLinkContestRoom_25_33/map.json | 18 ++++++++++++++++++ data/maps/UnknownLinkContestRoom_25_33/scripts.inc | 1 + data/maps/UnknownLinkContestRoom_25_34/map.json | 18 ++++++++++++++++++ data/maps/UnknownLinkContestRoom_25_34/scripts.inc | 1 + data/maps/UnknownMap_25_29/map.json | 18 ------------------ data/maps/UnknownMap_25_29/scripts.inc | 1 - data/maps/UnknownMap_25_30/map.json | 18 ------------------ data/maps/UnknownMap_25_30/scripts.inc | 1 - data/maps/UnknownMap_25_31/map.json | 18 ------------------ data/maps/UnknownMap_25_31/scripts.inc | 1 - data/maps/UnknownMap_25_32/map.json | 18 ------------------ data/maps/UnknownMap_25_32/scripts.inc | 1 - data/maps/UnknownMap_25_33/map.json | 18 ------------------ data/maps/UnknownMap_25_33/scripts.inc | 1 - data/maps/UnknownMap_25_34/map.json | 18 ------------------ data/maps/UnknownMap_25_34/scripts.inc | 1 - data/maps/map_groups.json | 12 ++++++------ 36 files changed, 132 insertions(+), 132 deletions(-) create mode 100644 data/maps/UnknownLinkContestRoom_25_29/map.json create mode 100644 data/maps/UnknownLinkContestRoom_25_29/scripts.inc create mode 100644 data/maps/UnknownLinkContestRoom_25_30/map.json create mode 100644 data/maps/UnknownLinkContestRoom_25_30/scripts.inc create mode 100644 data/maps/UnknownLinkContestRoom_25_31/map.json create mode 100644 data/maps/UnknownLinkContestRoom_25_31/scripts.inc create mode 100644 data/maps/UnknownLinkContestRoom_25_32/map.json create mode 100644 data/maps/UnknownLinkContestRoom_25_32/scripts.inc create mode 100644 data/maps/UnknownLinkContestRoom_25_33/map.json create mode 100644 data/maps/UnknownLinkContestRoom_25_33/scripts.inc create mode 100644 data/maps/UnknownLinkContestRoom_25_34/map.json create mode 100644 data/maps/UnknownLinkContestRoom_25_34/scripts.inc delete mode 100644 data/maps/UnknownMap_25_29/map.json delete mode 100644 data/maps/UnknownMap_25_29/scripts.inc delete mode 100644 data/maps/UnknownMap_25_30/map.json delete mode 100644 data/maps/UnknownMap_25_30/scripts.inc delete mode 100644 data/maps/UnknownMap_25_31/map.json delete mode 100644 data/maps/UnknownMap_25_31/scripts.inc delete mode 100644 data/maps/UnknownMap_25_32/map.json delete mode 100644 data/maps/UnknownMap_25_32/scripts.inc delete mode 100644 data/maps/UnknownMap_25_33/map.json delete mode 100644 data/maps/UnknownMap_25_33/scripts.inc delete mode 100644 data/maps/UnknownMap_25_34/map.json delete mode 100644 data/maps/UnknownMap_25_34/scripts.inc (limited to 'data/maps') diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index b47df74b8..5c762743c 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -28,11 +28,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9CE9:: @ 81F9CE9 goto LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3 LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF3:: @ 81F9CF3 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC + setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE end LittlerootTown_ProfessorBirchsLab_EventScript_1F9CF7:: @ 81F9CF7 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480DAC + setmaplayoutindex LAYOUT_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB_WITH_TABLE setobjectmovementtype 3, MOVEMENT_TYPE_WANDER_UP_AND_DOWN setobjectxyperm 3, 5, 10 end diff --git a/data/maps/Route130/scripts.inc b/data/maps/Route130/scripts.inc index 819d9e4f3..8ca9dcbb0 100644 --- a/data/maps/Route130/scripts.inc +++ b/data/maps/Route130/scripts.inc @@ -27,7 +27,7 @@ Route130_MapScript1_1F7365: @ 81F7365 end Route130_EventScript_1F73B1:: @ 81F73B1 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08417FC4 + setmaplayoutindex LAYOUT_ROUTE130_MIRAGE_ISLAND end Route130_EventScript_1F73B5:: @ 81F73B5 diff --git a/data/maps/Route131/scripts.inc b/data/maps/Route131/scripts.inc index 700ac25f6..e709a14ef 100644 --- a/data/maps/Route131/scripts.inc +++ b/data/maps/Route131/scripts.inc @@ -9,7 +9,7 @@ Route131_MapScript1_1F740A: @ 81F740A end Route131_EventScript_1F741B:: @ 81F741B - setmaplayoutindex LAYOUT_UNKNOWN_MAP_0845D470 + setmaplayoutindex LAYOUT_ROUTE131_SKY_PILLAR return Route131_EventScript_1F741F:: @ 81F741F diff --git a/data/maps/SkyPillar_1F/scripts.inc b/data/maps/SkyPillar_1F/scripts.inc index 2230dad8d..a0b62df25 100644 --- a/data/maps/SkyPillar_1F/scripts.inc +++ b/data/maps/SkyPillar_1F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_1F_MapScript1_23961B: @ 823961B end SkyPillar_1F_EventScript_239627:: @ 8239627 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08480F54 + setmaplayoutindex LAYOUT_SKY_PILLAR_1F_CLEAN return diff --git a/data/maps/SkyPillar_2F/scripts.inc b/data/maps/SkyPillar_2F/scripts.inc index fa89f3893..a0a4aeaf3 100644 --- a/data/maps/SkyPillar_2F/scripts.inc +++ b/data/maps/SkyPillar_2F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_2F_MapScript1_23963B: @ 823963B end SkyPillar_2F_EventScript_23964C:: @ 823964C - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084810FC + setmaplayoutindex LAYOUT_SKY_PILLAR_2F_CLEAN return SkyPillar_2F_MapScript1_239650: @ 8239650 diff --git a/data/maps/SkyPillar_3F/scripts.inc b/data/maps/SkyPillar_3F/scripts.inc index 015d754eb..d78ee6266 100644 --- a/data/maps/SkyPillar_3F/scripts.inc +++ b/data/maps/SkyPillar_3F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_3F_MapScript1_239661: @ 8239661 end SkyPillar_3F_EventScript_23966D:: @ 823966D - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084812A4 + setmaplayoutindex LAYOUT_SKY_PILLAR_3F_CLEAN return diff --git a/data/maps/SkyPillar_4F/scripts.inc b/data/maps/SkyPillar_4F/scripts.inc index ccab2453c..3904e954f 100644 --- a/data/maps/SkyPillar_4F/scripts.inc +++ b/data/maps/SkyPillar_4F/scripts.inc @@ -11,7 +11,7 @@ SkyPillar_4F_MapScript1_239681: @ 8239681 end SkyPillar_4F_EventScript_239692:: @ 8239692 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_0848144C + setmaplayoutindex LAYOUT_SKY_PILLAR_4F_CLEAN return SkyPillar_4F_MapScript1_239696: @ 8239696 diff --git a/data/maps/SkyPillar_5F/scripts.inc b/data/maps/SkyPillar_5F/scripts.inc index b3e3f6605..20478e77e 100644 --- a/data/maps/SkyPillar_5F/scripts.inc +++ b/data/maps/SkyPillar_5F/scripts.inc @@ -8,6 +8,6 @@ SkyPillar_5F_MapScript1_2396A8: @ 82396A8 return SkyPillar_5F_EventScript_2396B4:: @ 82396B4 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_084815F4 + setmaplayoutindex LAYOUT_SKY_PILLAR_5F_CLEAN return diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index f764ea79c..4ca4c4681 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -23,7 +23,7 @@ SkyPillar_Top_MapScript1_2396E6: @ 82396E6 end SkyPillar_Top_EventScript_2396FD:: @ 82396FD - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481B24 + setmaplayoutindex LAYOUT_SKY_PILLAR_TOP_CLEAN setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN return diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index 5e212ddfe..5666ce6cf 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -97,7 +97,7 @@ SootopolisCity_EventScript_1E5800:: @ 81E5800 return SootopolisCity_EventScript_1E5801:: @ 81E5801 - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08469200 + setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE return SootopolisCity_EventScript_1E5805:: @ 81E5805 diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc index 252bd1201..5db204293 100644 --- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc +++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc @@ -16,7 +16,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN - setmaplayoutindex LAYOUT_UNKNOWN_MAP_08481DBC + setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED return SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991 diff --git a/data/maps/UnknownLinkContestRoom_25_29/map.json b/data/maps/UnknownLinkContestRoom_25_29/map.json new file mode 100644 index 000000000..956a68158 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_29/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_29", + "name": "UnknownLinkContestRoom_25_29", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_29", + "music": "MUS_NIBI", + "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_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_29/scripts.inc b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_29/scripts.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownLinkContestRoom_25_30/map.json b/data/maps/UnknownLinkContestRoom_25_30/map.json new file mode 100644 index 000000000..526c6de2a --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_30/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_30", + "name": "UnknownLinkContestRoom_25_30", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_30", + "music": "MUS_NIBI", + "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_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_30/scripts.inc b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_30/scripts.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownLinkContestRoom_25_31/map.json b/data/maps/UnknownLinkContestRoom_25_31/map.json new file mode 100644 index 000000000..9548c1125 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_31/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_31", + "name": "UnknownLinkContestRoom_25_31", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_31", + "music": "MUS_NIBI", + "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_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_31/scripts.inc b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_31/scripts.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownLinkContestRoom_25_32/map.json b/data/maps/UnknownLinkContestRoom_25_32/map.json new file mode 100644 index 000000000..27411d28e --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_32/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_32", + "name": "UnknownLinkContestRoom_25_32", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_32", + "music": "MUS_NIBI", + "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_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_32/scripts.inc b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_32/scripts.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownLinkContestRoom_25_33/map.json b/data/maps/UnknownLinkContestRoom_25_33/map.json new file mode 100644 index 000000000..1a15ae6d6 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_33/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_33", + "name": "UnknownLinkContestRoom_25_33", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_33", + "music": "MUS_NIBI", + "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_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_33/scripts.inc b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_33/scripts.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownLinkContestRoom_25_34/map.json b/data/maps/UnknownLinkContestRoom_25_34/map.json new file mode 100644 index 000000000..4c90858b9 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_34/map.json @@ -0,0 +1,18 @@ +{ + "id": "MAP_UNKNOWN_MAP_25_34", + "name": "UnknownLinkContestRoom_25_34", + "layout": "LAYOUT_UNKNOWN_LINK_CONTEST_ROOM_25_34", + "music": "MUS_NIBI", + "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_NORMAL", + "connections": null, + "shared_events_map": "LinkContestRoom1", + "shared_scripts_map": "LinkContestRoom1" +} \ No newline at end of file diff --git a/data/maps/UnknownLinkContestRoom_25_34/scripts.inc b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/data/maps/UnknownLinkContestRoom_25_34/scripts.inc @@ -0,0 +1 @@ + diff --git a/data/maps/UnknownMap_25_29/map.json b/data/maps/UnknownMap_25_29/map.json deleted file mode 100644 index 8f7ac0226..000000000 --- a/data/maps/UnknownMap_25_29/map.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_25_29", - "name": "UnknownMap_25_29", - "layout": "LAYOUT_UNKNOWN_MAP_25_29", - "music": "MUS_NIBI", - "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_NORMAL", - "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" -} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_29/scripts.inc b/data/maps/UnknownMap_25_29/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_29/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_30/map.json b/data/maps/UnknownMap_25_30/map.json deleted file mode 100644 index 5f321e6b5..000000000 --- a/data/maps/UnknownMap_25_30/map.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_25_30", - "name": "UnknownMap_25_30", - "layout": "LAYOUT_UNKNOWN_MAP_25_30", - "music": "MUS_NIBI", - "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_NORMAL", - "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" -} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_30/scripts.inc b/data/maps/UnknownMap_25_30/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_30/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_31/map.json b/data/maps/UnknownMap_25_31/map.json deleted file mode 100644 index f7b06ac42..000000000 --- a/data/maps/UnknownMap_25_31/map.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_25_31", - "name": "UnknownMap_25_31", - "layout": "LAYOUT_UNKNOWN_MAP_25_31", - "music": "MUS_NIBI", - "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_NORMAL", - "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" -} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_31/scripts.inc b/data/maps/UnknownMap_25_31/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_31/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_32/map.json b/data/maps/UnknownMap_25_32/map.json deleted file mode 100644 index c963d0129..000000000 --- a/data/maps/UnknownMap_25_32/map.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_25_32", - "name": "UnknownMap_25_32", - "layout": "LAYOUT_UNKNOWN_MAP_25_32", - "music": "MUS_NIBI", - "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_NORMAL", - "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" -} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_32/scripts.inc b/data/maps/UnknownMap_25_32/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_32/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_33/map.json b/data/maps/UnknownMap_25_33/map.json deleted file mode 100644 index 441f767b6..000000000 --- a/data/maps/UnknownMap_25_33/map.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_25_33", - "name": "UnknownMap_25_33", - "layout": "LAYOUT_UNKNOWN_MAP_25_33", - "music": "MUS_NIBI", - "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_NORMAL", - "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" -} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_33/scripts.inc b/data/maps/UnknownMap_25_33/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_33/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/UnknownMap_25_34/map.json b/data/maps/UnknownMap_25_34/map.json deleted file mode 100644 index 7bdf1d226..000000000 --- a/data/maps/UnknownMap_25_34/map.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_25_34", - "name": "UnknownMap_25_34", - "layout": "LAYOUT_UNKNOWN_MAP_25_34", - "music": "MUS_NIBI", - "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_NORMAL", - "connections": null, - "shared_events_map": "LinkContestRoom1", - "shared_scripts_map": "LinkContestRoom1" -} \ No newline at end of file diff --git a/data/maps/UnknownMap_25_34/scripts.inc b/data/maps/UnknownMap_25_34/scripts.inc deleted file mode 100644 index 8b1378917..000000000 --- a/data/maps/UnknownMap_25_34/scripts.inc +++ /dev/null @@ -1 +0,0 @@ - diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index e20d1adf2..4088ddbb5 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -461,12 +461,12 @@ "RecordCorner", "DoubleBattleColosseum", "LinkContestRoom1", - "UnknownMap_25_29", - "UnknownMap_25_30", - "UnknownMap_25_31", - "UnknownMap_25_32", - "UnknownMap_25_33", - "UnknownMap_25_34", + "UnknownLinkContestRoom_25_29", + "UnknownLinkContestRoom_25_30", + "UnknownLinkContestRoom_25_31", + "UnknownLinkContestRoom_25_32", + "UnknownLinkContestRoom_25_33", + "UnknownLinkContestRoom_25_34", "LinkContestRoom2", "LinkContestRoom3", "LinkContestRoom4", -- cgit v1.2.3