From f6af394f2a252a6f8941172ce08f4b38f7d8a643 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 28 Jan 2020 16:40:19 -0500 Subject: Label tilesets and remaining layouts --- data/maps/Prototype_SeviiIsle_6/map.json | 25 +++++++++++++++++++++++++ data/maps/Prototype_SeviiIsle_6/scripts.inc | 2 ++ data/maps/Prototype_SeviiIsle_7/map.json | 25 +++++++++++++++++++++++++ data/maps/Prototype_SeviiIsle_7/scripts.inc | 2 ++ data/maps/Prototype_SeviiIsle_8/map.json | 19 +++++++++++++++++++ data/maps/Prototype_SeviiIsle_8/scripts.inc | 2 ++ data/maps/Prototype_SeviiIsle_9/map.json | 19 +++++++++++++++++++ data/maps/Prototype_SeviiIsle_9/scripts.inc | 2 ++ data/maps/SevenIsland_House_Room1/scripts.inc | 2 +- data/maps/UnknownMap_03_50/map.json | 25 ------------------------- data/maps/UnknownMap_03_50/scripts.inc | 2 -- data/maps/UnknownMap_03_51/map.json | 25 ------------------------- data/maps/UnknownMap_03_51/scripts.inc | 2 -- data/maps/UnknownMap_03_52/map.json | 19 ------------------- data/maps/UnknownMap_03_52/scripts.inc | 2 -- data/maps/UnknownMap_03_53/map.json | 19 ------------------- data/maps/UnknownMap_03_53/scripts.inc | 2 -- data/maps/ViridianCity_Mart/scripts.inc | 4 ++-- data/maps/map_groups.json | 12 ++++++------ 19 files changed, 105 insertions(+), 105 deletions(-) create mode 100644 data/maps/Prototype_SeviiIsle_6/map.json create mode 100644 data/maps/Prototype_SeviiIsle_6/scripts.inc create mode 100644 data/maps/Prototype_SeviiIsle_7/map.json create mode 100644 data/maps/Prototype_SeviiIsle_7/scripts.inc create mode 100644 data/maps/Prototype_SeviiIsle_8/map.json create mode 100644 data/maps/Prototype_SeviiIsle_8/scripts.inc create mode 100644 data/maps/Prototype_SeviiIsle_9/map.json create mode 100644 data/maps/Prototype_SeviiIsle_9/scripts.inc delete mode 100644 data/maps/UnknownMap_03_50/map.json delete mode 100644 data/maps/UnknownMap_03_50/scripts.inc delete mode 100644 data/maps/UnknownMap_03_51/map.json delete mode 100644 data/maps/UnknownMap_03_51/scripts.inc delete mode 100644 data/maps/UnknownMap_03_52/map.json delete mode 100644 data/maps/UnknownMap_03_52/scripts.inc delete mode 100644 data/maps/UnknownMap_03_53/map.json delete mode 100644 data/maps/UnknownMap_03_53/scripts.inc (limited to 'data/maps') diff --git a/data/maps/Prototype_SeviiIsle_6/map.json b/data/maps/Prototype_SeviiIsle_6/map.json new file mode 100644 index 000000000..3cc89f9f0 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_6/map.json @@ -0,0 +1,25 @@ +{ + "id": "MAP_PROTOTYPE_SEVII_ISLE_6", + "name": "Prototype_SeviiIsle_6", + "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_6", + "music": "MUS_NANASHIMA", + "region_map_section": "MAPSEC_SEVII_ISLE_6", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Prototype_SeviiIsle_6/scripts.inc b/data/maps/Prototype_SeviiIsle_6/scripts.inc new file mode 100644 index 000000000..459729f14 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_6/scripts.inc @@ -0,0 +1,2 @@ +Prototype_SeviiIsle_6_MapScripts:: @ 81687E0 + .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_7/map.json b/data/maps/Prototype_SeviiIsle_7/map.json new file mode 100644 index 000000000..67a37d7e7 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_7/map.json @@ -0,0 +1,25 @@ +{ + "id": "MAP_PROTOTYPE_SEVII_ISLE_7", + "name": "Prototype_SeviiIsle_7", + "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_7", + "music": "MUS_NANASHIMA", + "region_map_section": "MAPSEC_SEVII_ISLE_7", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": [ + { + "map": "MAP_THREE_ISLAND", + "offset": 0, + "direction": "up" + } + ], + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Prototype_SeviiIsle_7/scripts.inc b/data/maps/Prototype_SeviiIsle_7/scripts.inc new file mode 100644 index 000000000..b7eaa6bd5 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_7/scripts.inc @@ -0,0 +1,2 @@ +Prototype_SeviiIsle_7_MapScripts:: @ 81687E1 + .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_8/map.json b/data/maps/Prototype_SeviiIsle_8/map.json new file mode 100644 index 000000000..0ed21e3f2 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_8/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_PROTOTYPE_SEVII_ISLE_8", + "name": "Prototype_SeviiIsle_8", + "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_8", + "music": "MUS_NANASHIMA", + "region_map_section": "MAPSEC_SEVII_ISLE_8", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Prototype_SeviiIsle_8/scripts.inc b/data/maps/Prototype_SeviiIsle_8/scripts.inc new file mode 100644 index 000000000..411a66513 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_8/scripts.inc @@ -0,0 +1,2 @@ +Prototype_SeviiIsle_8_MapScripts:: @ 81687E2 + .byte 0 diff --git a/data/maps/Prototype_SeviiIsle_9/map.json b/data/maps/Prototype_SeviiIsle_9/map.json new file mode 100644 index 000000000..1fa4c73c4 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_9/map.json @@ -0,0 +1,19 @@ +{ + "id": "MAP_PROTOTYPE_SEVII_ISLE_9", + "name": "Prototype_SeviiIsle_9", + "layout": "LAYOUT_PROTOTYPE_SEVII_ISLE_9", + "music": "MUS_NANASHIMA", + "region_map_section": "MAPSEC_SEVII_ISLE_9", + "requires_flash": false, + "weather": "WEATHER_SUNNY", + "map_type": "MAP_TYPE_3", + "unknown_18": 1, + "unknown_19": 6, + "elevator_flag": 0, + "battle_scene": "BATTLE_SCENE_0", + "connections": null, + "object_events": [], + "warp_events": [], + "coord_events": [], + "bg_events": [] +} diff --git a/data/maps/Prototype_SeviiIsle_9/scripts.inc b/data/maps/Prototype_SeviiIsle_9/scripts.inc new file mode 100644 index 000000000..00b06c7f0 --- /dev/null +++ b/data/maps/Prototype_SeviiIsle_9/scripts.inc @@ -0,0 +1,2 @@ +Prototype_SeviiIsle_9_MapScripts:: @ 81687E3 + .byte 0 diff --git a/data/maps/SevenIsland_House_Room1/scripts.inc b/data/maps/SevenIsland_House_Room1/scripts.inc index 60183ed13..8875211f8 100644 --- a/data/maps/SevenIsland_House_Room1/scripts.inc +++ b/data/maps/SevenIsland_House_Room1/scripts.inc @@ -15,7 +15,7 @@ EventScript_1708AF:: @ 81708AF setvar VAR_TEMP_1, 1 setobjectxyperm 1, 4, 2 setobjectmovementtype 1, 8 - setmaplayoutindex LAYOUT_UNUSED_LAYOUT_8338B4C + setmaplayoutindex LAYOUT_SEVEN_ISLAND_HOUSE_ROOM1_DOOR_OPEN return EventScript_1708C3:: @ 81708C3 diff --git a/data/maps/UnknownMap_03_50/map.json b/data/maps/UnknownMap_03_50/map.json deleted file mode 100644 index 25d12e137..000000000 --- a/data/maps/UnknownMap_03_50/map.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_03_50", - "name": "UnknownMap_03_50", - "layout": "LAYOUT_UNKNOWN_MAP_03_50", - "music": "MUS_NANASHIMA", - "region_map_section": "MAPSEC_SEVII_ISLE_6", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": [ - { - "map": "MAP_THREE_ISLAND", - "offset": 0, - "direction": "up" - } - ], - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_03_50/scripts.inc b/data/maps/UnknownMap_03_50/scripts.inc deleted file mode 100644 index 4e136faae..000000000 --- a/data/maps/UnknownMap_03_50/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_50_MapScripts:: @ 81687E0 - .byte 0 diff --git a/data/maps/UnknownMap_03_51/map.json b/data/maps/UnknownMap_03_51/map.json deleted file mode 100644 index 25c135de4..000000000 --- a/data/maps/UnknownMap_03_51/map.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_03_51", - "name": "UnknownMap_03_51", - "layout": "LAYOUT_UNKNOWN_MAP_03_51", - "music": "MUS_NANASHIMA", - "region_map_section": "MAPSEC_SEVII_ISLE_7", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": [ - { - "map": "MAP_THREE_ISLAND", - "offset": 0, - "direction": "up" - } - ], - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_03_51/scripts.inc b/data/maps/UnknownMap_03_51/scripts.inc deleted file mode 100644 index 7398062d8..000000000 --- a/data/maps/UnknownMap_03_51/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_51_MapScripts:: @ 81687E1 - .byte 0 diff --git a/data/maps/UnknownMap_03_52/map.json b/data/maps/UnknownMap_03_52/map.json deleted file mode 100644 index e38359999..000000000 --- a/data/maps/UnknownMap_03_52/map.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_03_52", - "name": "UnknownMap_03_52", - "layout": "LAYOUT_UNKNOWN_MAP_03_52", - "music": "MUS_NANASHIMA", - "region_map_section": "MAPSEC_SEVII_ISLE_8", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_03_52/scripts.inc b/data/maps/UnknownMap_03_52/scripts.inc deleted file mode 100644 index 2e48ca113..000000000 --- a/data/maps/UnknownMap_03_52/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_52_MapScripts:: @ 81687E2 - .byte 0 diff --git a/data/maps/UnknownMap_03_53/map.json b/data/maps/UnknownMap_03_53/map.json deleted file mode 100644 index e3001e6be..000000000 --- a/data/maps/UnknownMap_03_53/map.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "id": "MAP_UNKNOWN_MAP_03_53", - "name": "UnknownMap_03_53", - "layout": "LAYOUT_UNKNOWN_MAP_03_53", - "music": "MUS_NANASHIMA", - "region_map_section": "MAPSEC_SEVII_ISLE_9", - "requires_flash": false, - "weather": "WEATHER_SUNNY", - "map_type": "MAP_TYPE_3", - "unknown_18": 1, - "unknown_19": 6, - "elevator_flag": 0, - "battle_scene": "BATTLE_SCENE_0", - "connections": null, - "object_events": [], - "warp_events": [], - "coord_events": [], - "bg_events": [] -} diff --git a/data/maps/UnknownMap_03_53/scripts.inc b/data/maps/UnknownMap_03_53/scripts.inc deleted file mode 100644 index 2dec9650e..000000000 --- a/data/maps/UnknownMap_03_53/scripts.inc +++ /dev/null @@ -1,2 +0,0 @@ -UnknownMap_03_53_MapScripts:: @ 81687E3 - .byte 0 diff --git a/data/maps/ViridianCity_Mart/scripts.inc b/data/maps/ViridianCity_Mart/scripts.inc index 5ad0d9a2f..cb458b682 100644 --- a/data/maps/ViridianCity_Mart/scripts.inc +++ b/data/maps/ViridianCity_Mart/scripts.inc @@ -8,8 +8,8 @@ ViridianCity_Mart_OnLoad:: @ 816A1DE end ViridianCity_Mart_EventScript_HideQuestionnaire:: @ 816A1E8 - setmetatile 1, 3, METATILE_Shop_CounterMid_Top, 1 - setmetatile 1, 4, METATILE_Shop_CounterMid_Bottom, 1 + setmetatile 1, 3, METATILE_Mart_CounterMid_Top, 1 + setmetatile 1, 4, METATILE_Mart_CounterMid_Bottom, 1 end ViridianCity_Mart_OnFrame:: @ 816A1FB diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json index 05f1cd544..27213f55e 100644 --- a/data/maps/map_groups.json +++ b/data/maps/map_groups.json @@ -289,10 +289,10 @@ "TwoIsland_CapeBrink", "ThreeIsland_BondBridge", "ThreeIsland_Port", - "UnknownMap_03_50", - "UnknownMap_03_51", - "UnknownMap_03_52", - "UnknownMap_03_53", + "Prototype_SeviiIsle_6", + "Prototype_SeviiIsle_7", + "Prototype_SeviiIsle_8", + "Prototype_SeviiIsle_9", "FiveIsland_ResortGorgeous", "FiveIsland_WaterLabyrinth", "FiveIsland_Meadow", @@ -605,8 +605,8 @@ "TwoIsland_CapeBrink", "ThreeIsland_BondBridge", "ThreeIsland_Port", - "UnknownMap_03_50", - "UnknownMap_03_51", + "Prototype_SeviiIsle_6", + "Prototype_SeviiIsle_7", "FiveIsland_ResortGorgeous", "FiveIsland_WaterLabyrinth", "FiveIsland_Meadow", -- cgit v1.2.3