dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Give proper names to underwater maps

Browse Source
This commit is contained in:
GriffinR
2020-09-01 03:03:14 -04:00
parent 5773bb8643
commit f5495d1220
57 changed files with 498 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/maps/Route105/map.json
View File

@@ -26,7 +26,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER6"
"map": "MAP_UNDERWATER_ROUTE105"
}
],
"object_events": [

2
data/maps/Route124/map.json
View File

@@ -36,7 +36,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER1"
"map": "MAP_UNDERWATER_ROUTE124"
}
],
"object_events": [

2
data/maps/Route125/map.json
View File

@@ -26,7 +26,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER7"
"map": "MAP_UNDERWATER_ROUTE125"
}
],
"object_events": [

2
data/maps/Route126/map.json
View File

@@ -26,7 +26,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER2"
"map": "MAP_UNDERWATER_ROUTE126"
}
],
"object_events": [

2
data/maps/Route127/map.json
View File

@@ -31,7 +31,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER3"
"map": "MAP_UNDERWATER_ROUTE127"
}
],
"object_events": [

2
data/maps/Route128/map.json
View File

@@ -31,7 +31,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER4"
"map": "MAP_UNDERWATER_ROUTE128"
}
],
"object_events": [

2
data/maps/Route129/map.json
View File

@@ -26,7 +26,7 @@
{
"direction": "dive",
"offset": 0,
"map": "MAP_UNDERWATER5"
"map": "MAP_UNDERWATER_ROUTE129"
}
],
"object_events": [

2
data/maps/SeafloorCavern_Entrance/map.json
View File

@@ -33,7 +33,7 @@
"x": 10,
"y": 18,
"elevation": 3,
"dest_map": "MAP_UNDERWATER4",
"dest_map": "MAP_UNDERWATER_ROUTE128",
"dest_warp_id": 0
},
{

3
data/maps/Underwater1/scripts.inc
View File

@@ -1,3 +0,0 @@
Underwater1_MapScripts:: @ 81F7722
.byte 0

3
data/maps/Underwater2/scripts.inc
View File

@@ -1,3 +0,0 @@
Underwater2_MapScripts:: @ 81F7723
.byte 0

8
data/maps/Underwater3/scripts.inc
View File

@@ -1,8 +0,0 @@
Underwater3_MapScripts:: @ 81F7724
map_script MAP_SCRIPT_ON_RESUME, Underwater3_OnResume
.byte 0
Underwater3_OnResume: @ 81F772A
call AbnormalWeather_Underwater_SetupEscapeWarp
end

3
data/maps/Underwater4/scripts.inc
View File

@@ -1,3 +0,0 @@
Underwater4_MapScripts:: @ 81F7730
.byte 0

8
data/maps/Underwater5/scripts.inc
View File

@@ -1,8 +0,0 @@
Underwater5_MapScripts:: @ 81F7731
map_script MAP_SCRIPT_ON_RESUME, Underwater5_OnResume
.byte 0
Underwater5_OnResume: @ 81F7737
call AbnormalWeather_Underwater_SetupEscapeWarp
end

8
data/maps/Underwater6/scripts.inc
View File

@@ -1,8 +0,0 @@
Underwater6_MapScripts:: @ 81F773D
map_script MAP_SCRIPT_ON_RESUME, Underwater6_OnResume
.byte 0
Underwater6_OnResume: @ 81F7743
call AbnormalWeather_Underwater_SetupEscapeWarp
end

8
data/maps/Underwater7/scripts.inc
View File

@@ -1,8 +0,0 @@
Underwater7_MapScripts:: @ 81F7749
map_script MAP_SCRIPT_ON_RESUME, Underwater7_OnResume
.byte 0
Underwater7_OnResume: @ 81F774F
call AbnormalWeather_Underwater_SetupEscapeWarp
end

8
data/maps/Underwater6/map.json → data/maps/Underwater_Route105/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER6",
"name": "Underwater6",
"layout": "LAYOUT_UNDERWATER6",
"id": "MAP_UNDERWATER_ROUTE105",
"name": "Underwater_Route105",
"layout": "LAYOUT_UNDERWATER_ROUTE105",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_TERRA_CAVE",
"region_map_section": "MAPSEC_UNDERWATER_105",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",

8
data/maps/Underwater_Route105/scripts.inc Normal file
View File

@@ -0,0 +1,8 @@
Underwater_Route105_MapScripts:: @ 81F773D
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route105_OnResume
.byte 0
Underwater_Route105_OnResume: @ 81F7743
call AbnormalWeather_Underwater_SetupEscapeWarp
end

22
data/maps/Underwater1/map.json → data/maps/Underwater_Route124/map.json
View File

@@ -1,7 +1,7 @@
{
"id": "MAP_UNDERWATER1",
"name": "Underwater1",
"layout": "LAYOUT_UNDERWATER1",
"id": "MAP_UNDERWATER_ROUTE124",
"name": "Underwater_Route124",
"layout": "LAYOUT_UNDERWATER_ROUTE124",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_124",
"requires_flash": false,
@@ -16,7 +16,7 @@
{
"direction": "down",
"offset": 0,
"map": "MAP_UNDERWATER2"
"map": "MAP_UNDERWATER_ROUTE126"
},
{
"direction": "emerge",
@@ -34,7 +34,7 @@
"y": 51,
"elevation": 0,
"item": "ITEM_CARBOS",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS"
},
{
"type": "hidden_item",
@@ -42,7 +42,7 @@
"y": 40,
"elevation": 0,
"item": "ITEM_GREEN_SHARD",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD"
},
{
"type": "hidden_item",
@@ -50,7 +50,7 @@
"y": 34,
"elevation": 3,
"item": "ITEM_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL"
},
{
"type": "hidden_item",
@@ -58,7 +58,7 @@
"y": 54,
"elevation": 3,
"item": "ITEM_BIG_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL"
},
{
"type": "hidden_item",
@@ -66,7 +66,7 @@
"y": 64,
"elevation": 3,
"item": "ITEM_HEART_SCALE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1"
},
{
"type": "hidden_item",
@@ -74,7 +74,7 @@
"y": 5,
"elevation": 3,
"item": "ITEM_CALCIUM",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM"
},
{
"type": "hidden_item",
@@ -82,7 +82,7 @@
"y": 36,
"elevation": 3,
"item": "ITEM_HEART_SCALE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2"
}
]
}

3
data/maps/Underwater_Route124/scripts.inc Normal file
View File

@@ -0,0 +1,3 @@
Underwater_Route124_MapScripts:: @ 81F7722
.byte 0

8
data/maps/Underwater7/map.json → data/maps/Underwater_Route125/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER7",
"name": "Underwater7",
"layout": "LAYOUT_UNDERWATER7",
"id": "MAP_UNDERWATER_ROUTE125",
"name": "Underwater_Route125",
"layout": "LAYOUT_UNDERWATER_ROUTE125",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_UNK1",
"region_map_section": "MAPSEC_UNDERWATER_125",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",

8
data/maps/Underwater_Route125/scripts.inc Normal file
View File

@@ -0,0 +1,8 @@
Underwater_Route125_MapScripts:: @ 81F7749
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route125_OnResume
.byte 0
Underwater_Route125_OnResume: @ 81F774F
call AbnormalWeather_Underwater_SetupEscapeWarp
end

28
data/maps/Underwater2/map.json → data/maps/Underwater_Route126/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER2",
"name": "Underwater2",
"layout": "LAYOUT_UNDERWATER2",
"id": "MAP_UNDERWATER_ROUTE126",
"name": "Underwater_Route126",
"layout": "LAYOUT_UNDERWATER_ROUTE126",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_125",
"region_map_section": "MAPSEC_UNDERWATER_126",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",
@@ -16,12 +16,12 @@
{
"direction": "up",
"offset": 0,
"map": "MAP_UNDERWATER1"
"map": "MAP_UNDERWATER_ROUTE124"
},
{
"direction": "right",
"offset": 0,
"map": "MAP_UNDERWATER3"
"map": "MAP_UNDERWATER_ROUTE127"
},
{
"direction": "emerge",
@@ -47,7 +47,7 @@
"y": 17,
"elevation": 3,
"item": "ITEM_HEART_SCALE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE"
},
{
"type": "hidden_item",
@@ -55,7 +55,7 @@
"y": 19,
"elevation": 3,
"item": "ITEM_ULTRA_BALL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL"
},
{
"type": "hidden_item",
@@ -63,7 +63,7 @@
"y": 19,
"elevation": 3,
"item": "ITEM_STARDUST",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST"
},
{
"type": "hidden_item",
@@ -71,7 +71,7 @@
"y": 36,
"elevation": 3,
"item": "ITEM_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL"
},
{
"type": "hidden_item",
@@ -79,7 +79,7 @@
"y": 39,
"elevation": 3,
"item": "ITEM_IRON",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON"
},
{
"type": "hidden_item",
@@ -87,7 +87,7 @@
"y": 35,
"elevation": 3,
"item": "ITEM_YELLOW_SHARD",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD"
},
{
"type": "hidden_item",
@@ -95,7 +95,7 @@
"y": 60,
"elevation": 3,
"item": "ITEM_BIG_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL"
},
{
"type": "hidden_item",
@@ -103,7 +103,7 @@
"y": 77,
"elevation": 3,
"item": "ITEM_BLUE_SHARD",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD"
}
]
}

3
data/maps/Underwater_Route126/scripts.inc Normal file
View File

@@ -0,0 +1,3 @@
Underwater_Route126_MapScripts:: @ 81F7723
.byte 0

20
data/maps/Underwater3/map.json → data/maps/Underwater_Route127/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER3",
"name": "Underwater3",
"layout": "LAYOUT_UNDERWATER3",
"id": "MAP_UNDERWATER_ROUTE127",
"name": "Underwater_Route127",
"layout": "LAYOUT_UNDERWATER_ROUTE127",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_126",
"region_map_section": "MAPSEC_UNDERWATER_127",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",
@@ -21,12 +21,12 @@
{
"direction": "left",
"offset": 0,
"map": "MAP_UNDERWATER2"
"map": "MAP_UNDERWATER_ROUTE126"
},
{
"direction": "down",
"offset": 0,
"map": "MAP_UNDERWATER4"
"map": "MAP_UNDERWATER_ROUTE128"
}
],
"object_events": [],
@@ -54,7 +54,7 @@
"y": 42,
"elevation": 3,
"item": "ITEM_STAR_PIECE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE"
},
{
"type": "hidden_item",
@@ -62,7 +62,7 @@
"y": 36,
"elevation": 3,
"item": "ITEM_HP_UP",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP"
},
{
"type": "hidden_item",
@@ -70,7 +70,7 @@
"y": 72,
"elevation": 3,
"item": "ITEM_HEART_SCALE",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE"
},
{
"type": "hidden_item",
@@ -78,7 +78,7 @@
"y": 20,
"elevation": 3,
"item": "ITEM_RED_SHARD",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD"
}
]
}

8
data/maps/Underwater_Route127/scripts.inc Normal file
View File

@@ -0,0 +1,8 @@
Underwater_Route127_MapScripts:: @ 81F7724
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route127_OnResume
.byte 0
Underwater_Route127_OnResume: @ 81F772A
call AbnormalWeather_Underwater_SetupEscapeWarp
end

14
data/maps/Underwater4/map.json → data/maps/Underwater_Route128/map.json
View File

@@ -1,9 +1,9 @@
{
"id": "MAP_UNDERWATER4",
"name": "Underwater4",
"layout": "LAYOUT_UNDERWATER4",
"id": "MAP_UNDERWATER_ROUTE128",
"name": "Underwater_Route128",
"layout": "LAYOUT_UNDERWATER_ROUTE128",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_127",
"region_map_section": "MAPSEC_UNDERWATER_128",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",
@@ -16,7 +16,7 @@
{
"direction": "up",
"offset": 0,
"map": "MAP_UNDERWATER3"
"map": "MAP_UNDERWATER_ROUTE127"
},
{
"direction": "emerge",
@@ -42,7 +42,7 @@
"y": 19,
"elevation": 3,
"item": "ITEM_PROTEIN",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN"
},
{
"type": "hidden_item",
@@ -50,7 +50,7 @@
"y": 18,
"elevation": 3,
"item": "ITEM_PEARL",
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL"
"flag": "FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL"
}
]
}

3
data/maps/Underwater_Route128/scripts.inc Normal file
View File

@@ -0,0 +1,3 @@
Underwater_Route128_MapScripts:: @ 81F7730
.byte 0

6
data/maps/Underwater5/map.json → data/maps/Underwater_Route129/map.json
View File

@@ -1,7 +1,7 @@
{
"id": "MAP_UNDERWATER5",
"name": "Underwater5",
"layout": "LAYOUT_UNDERWATER5",
"id": "MAP_UNDERWATER_ROUTE129",
"name": "Underwater_Route129",
"layout": "LAYOUT_UNDERWATER_ROUTE129",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_129",
"requires_flash": false,

8
data/maps/Underwater_Route129/scripts.inc Normal file
View File

@@ -0,0 +1,8 @@
Underwater_Route129_MapScripts:: @ 81F7731
map_script MAP_SCRIPT_ON_RESUME, Underwater_Route129_OnResume
.byte 0
Underwater_Route129_OnResume: @ 81F7737
call AbnormalWeather_Underwater_SetupEscapeWarp
end

4
data/maps/Underwater_SeafloorCavern/map.json
View File

@@ -3,7 +3,7 @@
"name": "Underwater_SeafloorCavern",
"layout": "LAYOUT_UNDERWATER_SEAFLOOR_CAVERN",
"music": "MUS_UNDERWATER",
"region_map_section": "MAPSEC_UNDERWATER_128",
"region_map_section": "MAPSEC_UNDERWATER_SEAFLOOR_CAVERN",
"requires_flash": false,
"weather": "WEATHER_UNDERWATER_BUBBLES",
"map_type": "MAP_TYPE_UNDERWATER",
@@ -72,7 +72,7 @@
"x": 6,
"y": 7,
"elevation": 0,
"dest_map": "MAP_UNDERWATER4",
"dest_map": "MAP_UNDERWATER_ROUTE128",
"dest_warp_id": 0
}
],

4
data/maps/Underwater_SootopolisCity/map.json
View File

@@ -19,14 +19,14 @@
"x": 9,
"y": 8,
"elevation": 0,
"dest_map": "MAP_UNDERWATER2",
"dest_map": "MAP_UNDERWATER_ROUTE126",
"dest_warp_id": 0
},
{
"x": 10,
"y": 8,
"elevation": 0,
"dest_map": "MAP_UNDERWATER2",
"dest_map": "MAP_UNDERWATER_ROUTE126",
"dest_warp_id": 0
}
],

28
data/maps/map_groups.json
View File

@@ -86,13 +86,13 @@
"Route132",
"Route133",
"Route134",
"Underwater1",
"Underwater2",
"Underwater3",
"Underwater4",
"Underwater5",
"Underwater6",
"Underwater7"
"Underwater_Route124",
"Underwater_Route126",
"Underwater_Route127",
"Underwater_Route128",
"Underwater_Route129",
"Underwater_Route105",
"Underwater_Route125"
],
"gMapGroup1": [
"LittlerootTown_BrendansHouse_1F",
@@ -672,13 +672,13 @@
"Route132",
"Route133",
"Route134",
"Underwater6",
"Underwater1",
"Underwater7",
"Underwater2",
"Underwater3",
"Underwater4",
"Underwater5",
"Underwater_Route105",
"Underwater_Route124",
"Underwater_Route125",
"Underwater_Route126",
"Underwater_Route127",
"Underwater_Route128",
"Underwater_Route129",
"SafariZone_Northwest",
"SafariZone_North",
"SafariZone_Southwest",