ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/event_scripts.s
View File

@ -151,13 +151,13 @@ gStdScripts_End:: @ 81DC2CC
.include "data/maps/Route132/scripts.inc"
.include "data/maps/Route133/scripts.inc"
.include "data/maps/Route134/scripts.inc"
.include "data/maps/Underwater1/scripts.inc"
.include "data/maps/Underwater2/scripts.inc"
.include "data/maps/Underwater3/scripts.inc"
.include "data/maps/Underwater4/scripts.inc"
.include "data/maps/Underwater5/scripts.inc"
.include "data/maps/Underwater6/scripts.inc"
.include "data/maps/Underwater7/scripts.inc"
.include "data/maps/Underwater_Route124/scripts.inc"
.include "data/maps/Underwater_Route126/scripts.inc"
.include "data/maps/Underwater_Route127/scripts.inc"
.include "data/maps/Underwater_Route128/scripts.inc"
.include "data/maps/Underwater_Route129/scripts.inc"
.include "data/maps/Underwater_Route105/scripts.inc"
.include "data/maps/Underwater_Route125/scripts.inc"
.include "data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc"
.include "data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc"
.include "data/maps/LittlerootTown_MaysHouse_1F/scripts.inc"

0
data/layouts/Underwater1/border.bin → data/layouts/Underwater_Route105/border.bin
View File

0
data/layouts/Underwater6/map.bin → data/layouts/Underwater_Route105/map.bin
View File

0
data/layouts/Underwater2/border.bin → data/layouts/Underwater_Route124/border.bin
View File

0
data/layouts/Underwater1/map.bin → data/layouts/Underwater_Route124/map.bin
View File

0
data/layouts/Underwater3/border.bin → data/layouts/Underwater_Route125/border.bin
View File

0
data/layouts/Underwater7/map.bin → data/layouts/Underwater_Route125/map.bin
View File

0
data/layouts/Underwater4/border.bin → data/layouts/Underwater_Route126/border.bin
View File

0
data/layouts/Underwater2/map.bin → data/layouts/Underwater_Route126/map.bin
View File

0
data/layouts/Underwater5/border.bin → data/layouts/Underwater_Route127/border.bin
View File

0
data/layouts/Underwater3/map.bin → data/layouts/Underwater_Route127/map.bin
View File

0
data/layouts/Underwater6/border.bin → data/layouts/Underwater_Route128/border.bin
View File

0
data/layouts/Underwater4/map.bin → data/layouts/Underwater_Route128/map.bin
View File

0
data/layouts/Underwater7/border.bin → data/layouts/Underwater_Route129/border.bin
View File

0
data/layouts/Underwater5/map.bin → data/layouts/Underwater_Route129/map.bin
View File

56
data/layouts/layouts.json
View File

@ -502,34 +502,34 @@
"blockdata_filepath": "data/layouts/Route134/map.bin"
},
{
"id": "LAYOUT_UNDERWATER2",
"name": "Underwater2_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE126",
"name": "Underwater_Route126_Layout",
"width": 80,
"height": 80,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater2/border.bin",
"blockdata_filepath": "data/layouts/Underwater2/map.bin"
"border_filepath": "data/layouts/Underwater_Route126/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route126/map.bin"
},
{
"id": "LAYOUT_UNDERWATER3",
"name": "Underwater3_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE127",
"name": "Underwater_Route127_Layout",
"width": 80,
"height": 80,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater3/border.bin",
"blockdata_filepath": "data/layouts/Underwater3/map.bin"
"border_filepath": "data/layouts/Underwater_Route127/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route127/map.bin"
},
{
"id": "LAYOUT_UNDERWATER4",
"name": "Underwater4_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE128",
"name": "Underwater_Route128_Layout",
"width": 120,
"height": 40,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater4/border.bin",
"blockdata_filepath": "data/layouts/Underwater4/map.bin"
"border_filepath": "data/layouts/Underwater_Route128/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route128/map.bin"
},
{
"id": "LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F",
@ -2732,14 +2732,14 @@
"blockdata_filepath": "data/layouts/LilycoveCity_DepartmentStoreElevator/map.bin"
},
{
"id": "LAYOUT_UNDERWATER1",
"name": "Underwater1_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE124",
"name": "Underwater_Route124_Layout",
"width": 80,
"height": 80,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater1/border.bin",
"blockdata_filepath": "data/layouts/Underwater1/map.bin"
"border_filepath": "data/layouts/Underwater_Route124/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route124/map.bin"
},
{
"id": "LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F",
@ -4092,34 +4092,34 @@
"blockdata_filepath": "data/layouts/TerraCave_End/map.bin"
},
{
"id": "LAYOUT_UNDERWATER6",
"name": "Underwater6_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE105",
"name": "Underwater_Route105_Layout",
"width": 40,
"height": 80,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater6/border.bin",
"blockdata_filepath": "data/layouts/Underwater6/map.bin"
"border_filepath": "data/layouts/Underwater_Route105/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route105/map.bin"
},
{
"id": "LAYOUT_UNDERWATER7",
"name": "Underwater7_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE125",
"name": "Underwater_Route125_Layout",
"width": 80,
"height": 40,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater7/border.bin",
"blockdata_filepath": "data/layouts/Underwater7/map.bin"
"border_filepath": "data/layouts/Underwater_Route125/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route125/map.bin"
},
{
"id": "LAYOUT_UNDERWATER5",
"name": "Underwater5_Layout",
"id": "LAYOUT_UNDERWATER_ROUTE129",
"name": "Underwater_Route129_Layout",
"width": 80,
"height": 40,
"primary_tileset": "gTileset_General",
"secondary_tileset": "gTileset_Underwater",
"border_filepath": "data/layouts/Underwater5/border.bin",
"blockdata_filepath": "data/layouts/Underwater5/map.bin"
"border_filepath": "data/layouts/Underwater_Route129/border.bin",
"blockdata_filepath": "data/layouts/Underwater_Route129/map.bin"
},
{
"id": "LAYOUT_MARINE_CAVE_END",

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",

42
include/constants/flags.h
View File

@ -538,27 +538,27 @@
// Hidden Items -- sorted by location
#define FLAG_HIDDEN_ITEMS_START 0x1F4
#define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01)
#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x08)
#define FLAG_HIDDEN_ITEM_UNDERWATER_1_GREEN_SHARD (FLAG_HIDDEN_ITEMS_START + 0x09)
#define FLAG_HIDDEN_ITEM_UNDERWATER_1_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0A)
#define FLAG_HIDDEN_ITEM_UNDERWATER_1_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0B)
#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x0D)
#define FLAG_HIDDEN_ITEM_UNDERWATER_1_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x24)
#define FLAG_HIDDEN_ITEM_UNDERWATER_1_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x26)
#define FLAG_HIDDEN_ITEM_UNDERWATER_2_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x0E)
#define FLAG_HIDDEN_ITEM_UNDERWATER_2_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x0F)
#define FLAG_HIDDEN_ITEM_UNDERWATER_2_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x10)
#define FLAG_HIDDEN_ITEM_UNDERWATER_2_PEARL (FLAG_HIDDEN_ITEMS_START + 0x11)
#define FLAG_HIDDEN_ITEM_UNDERWATER_2_IRON (FLAG_HIDDEN_ITEMS_START + 0x13)
#define FLAG_HIDDEN_ITEM_UNDERWATER_2_YELLOW_SHARD (FLAG_HIDDEN_ITEMS_START + 0x12)
#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x14)
#define FLAG_HIDDEN_ITEM_UNDERWATER_2_BLUE_SHARD (FLAG_HIDDEN_ITEMS_START + 0x0C)
#define FLAG_HIDDEN_ITEM_UNDERWATER_3_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 0x15)
#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x16)
#define FLAG_HIDDEN_ITEM_UNDERWATER_3_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x17)
#define FLAG_HIDDEN_ITEM_UNDERWATER_3_RED_SHARD (FLAG_HIDDEN_ITEMS_START + 0x18)
#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19)
#define FLAG_HIDDEN_ITEM_UNDERWATER_4_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A)
#define FLAG_HIDDEN_ITEM_UNDERWATER_124_CARBOS (FLAG_HIDDEN_ITEMS_START + 0x08)
#define FLAG_HIDDEN_ITEM_UNDERWATER_124_GREEN_SHARD (FLAG_HIDDEN_ITEMS_START + 0x09)
#define FLAG_HIDDEN_ITEM_UNDERWATER_124_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0A)
#define FLAG_HIDDEN_ITEM_UNDERWATER_124_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x0B)
#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_1 (FLAG_HIDDEN_ITEMS_START + 0x0D)
#define FLAG_HIDDEN_ITEM_UNDERWATER_124_CALCIUM (FLAG_HIDDEN_ITEMS_START + 0x24)
#define FLAG_HIDDEN_ITEM_UNDERWATER_124_HEART_SCALE_2 (FLAG_HIDDEN_ITEMS_START + 0x26)
#define FLAG_HIDDEN_ITEM_UNDERWATER_126_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x0E)
#define FLAG_HIDDEN_ITEM_UNDERWATER_126_ULTRA_BALL (FLAG_HIDDEN_ITEMS_START + 0x0F)
#define FLAG_HIDDEN_ITEM_UNDERWATER_126_STARDUST (FLAG_HIDDEN_ITEMS_START + 0x10)
#define FLAG_HIDDEN_ITEM_UNDERWATER_126_PEARL (FLAG_HIDDEN_ITEMS_START + 0x11)
#define FLAG_HIDDEN_ITEM_UNDERWATER_126_IRON (FLAG_HIDDEN_ITEMS_START + 0x13)
#define FLAG_HIDDEN_ITEM_UNDERWATER_126_YELLOW_SHARD (FLAG_HIDDEN_ITEMS_START + 0x12)
#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BIG_PEARL (FLAG_HIDDEN_ITEMS_START + 0x14)
#define FLAG_HIDDEN_ITEM_UNDERWATER_126_BLUE_SHARD (FLAG_HIDDEN_ITEMS_START + 0x0C)
#define FLAG_HIDDEN_ITEM_UNDERWATER_127_STAR_PIECE (FLAG_HIDDEN_ITEMS_START + 0x15)
#define FLAG_HIDDEN_ITEM_UNDERWATER_127_HP_UP (FLAG_HIDDEN_ITEMS_START + 0x16)
#define FLAG_HIDDEN_ITEM_UNDERWATER_127_HEART_SCALE (FLAG_HIDDEN_ITEMS_START + 0x17)
#define FLAG_HIDDEN_ITEM_UNDERWATER_127_RED_SHARD (FLAG_HIDDEN_ITEMS_START + 0x18)
#define FLAG_HIDDEN_ITEM_UNDERWATER_128_PROTEIN (FLAG_HIDDEN_ITEMS_START + 0x19)
#define FLAG_HIDDEN_ITEM_UNDERWATER_128_PEARL (FLAG_HIDDEN_ITEMS_START + 0x1A)
#define FLAG_HIDDEN_ITEM_FALLARBOR_TOWN_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x1C)
#define FLAG_HIDDEN_ITEM_LAVARIDGE_TOWN_ICE_HEAL (FLAG_HIDDEN_ITEMS_START + 0x00)
#define FLAG_HIDDEN_ITEM_ABANDONED_SHIP_RM_1_KEY (FLAG_HIDDEN_ITEMS_START + 0x1F)

14
include/constants/layouts.h
View File

@ -55,9 +55,9 @@
#define LAYOUT_ROUTE132 48
#define LAYOUT_ROUTE133 49
#define LAYOUT_ROUTE134 50
#define LAYOUT_UNDERWATER2 51
#define LAYOUT_UNDERWATER3 52
#define LAYOUT_UNDERWATER4 53
#define LAYOUT_UNDERWATER_ROUTE126 51
#define LAYOUT_UNDERWATER_ROUTE127 52
#define LAYOUT_UNDERWATER_ROUTE128 53
#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F 54
#define LAYOUT_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F 55
#define LAYOUT_LITTLEROOT_TOWN_MAYS_HOUSE_1F 56
@ -278,7 +278,7 @@
#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_1F 271
#define LAYOUT_ROUTE119_WEATHER_INSTITUTE_2F 272
#define LAYOUT_LILYCOVE_CITY_DEPARTMENT_STORE_ELEVATOR 273
#define LAYOUT_UNDERWATER1 274
#define LAYOUT_UNDERWATER_ROUTE124 274
#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_1F 275
#define LAYOUT_MOSSDEEP_CITY_SPACE_CENTER_2F 276
#define LAYOUT_SS_TIDAL_CORRIDOR 277
@ -414,9 +414,9 @@
#define LAYOUT_MARINE_CAVE_ENTRANCE 407
#define LAYOUT_TERRA_CAVE_ENTRANCE 408
#define LAYOUT_TERRA_CAVE_END 409
#define LAYOUT_UNDERWATER6 410
#define LAYOUT_UNDERWATER7 411
#define LAYOUT_UNDERWATER5 412
#define LAYOUT_UNDERWATER_ROUTE105 410
#define LAYOUT_UNDERWATER_ROUTE125 411
#define LAYOUT_UNDERWATER_ROUTE129 412
#define LAYOUT_MARINE_CAVE_END 413
#define LAYOUT_TRAINER_HILL_ENTRANCE 414
#define LAYOUT_TRAINER_HILL_1F 415

14
include/constants/map_groups.h
View File

@ -56,13 +56,13 @@
#define MAP_ROUTE132 (47 | (0 << 8))
#define MAP_ROUTE133 (48 | (0 << 8))
#define MAP_ROUTE134 (49 | (0 << 8))
#define MAP_UNDERWATER1 (50 | (0 << 8))
#define MAP_UNDERWATER2 (51 | (0 << 8))
#define MAP_UNDERWATER3 (52 | (0 << 8))
#define MAP_UNDERWATER4 (53 | (0 << 8))
#define MAP_UNDERWATER5 (54 | (0 << 8))
#define MAP_UNDERWATER6 (55 | (0 << 8))
#define MAP_UNDERWATER7 (56 | (0 << 8))
#define MAP_UNDERWATER_ROUTE124 (50 | (0 << 8))
#define MAP_UNDERWATER_ROUTE126 (51 | (0 << 8))
#define MAP_UNDERWATER_ROUTE127 (52 | (0 << 8))
#define MAP_UNDERWATER_ROUTE128 (53 | (0 << 8))
#define MAP_UNDERWATER_ROUTE129 (54 | (0 << 8))
#define MAP_UNDERWATER_ROUTE105 (55 | (0 << 8))
#define MAP_UNDERWATER_ROUTE125 (56 | (0 << 8))
// Map Group 1
#define MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F (0 | (1 << 8))

12
include/constants/region_map_sections.h
View File

@ -52,9 +52,9 @@
#define MAPSEC_ROUTE_133 0x30
#define MAPSEC_ROUTE_134 0x31
#define MAPSEC_UNDERWATER_124 0x32
#define MAPSEC_UNDERWATER_125 0x33
#define MAPSEC_UNDERWATER_126 0x34
#define MAPSEC_UNDERWATER_127 0x35
#define MAPSEC_UNDERWATER_126 0x33
#define MAPSEC_UNDERWATER_127 0x34
#define MAPSEC_UNDERWATER_128 0x35
#define MAPSEC_UNDERWATER_SOOTOPOLIS 0x36
#define MAPSEC_GRANITE_CAVE 0x37
#define MAPSEC_MT_CHIMNEY 0x38
@ -70,7 +70,7 @@
#define MAPSEC_AQUA_HIDEOUT_OLD 0x42
#define MAPSEC_SHOAL_CAVE 0x43
#define MAPSEC_SEAFLOOR_CAVERN 0x44
#define MAPSEC_UNDERWATER_128 0x45
#define MAPSEC_UNDERWATER_SEAFLOOR_CAVERN 0x45
#define MAPSEC_VICTORY_ROAD 0x46
#define MAPSEC_MIRAGE_ISLAND 0x47
#define MAPSEC_CAVE_OF_ORIGIN 0x48
@ -207,8 +207,8 @@
#define MAPSEC_MARINE_CAVE 0xCB
#define MAPSEC_UNDERWATER_MARINE_CAVE 0xCC
#define MAPSEC_TERRA_CAVE 0xCD
#define MAPSEC_UNDERWATER_TERRA_CAVE 0xCE
#define MAPSEC_UNDERWATER_UNK1 0xCF
#define MAPSEC_UNDERWATER_105 0xCE
#define MAPSEC_UNDERWATER_125 0xCF
#define MAPSEC_UNDERWATER_129 0xD0
#define MAPSEC_DESERT_UNDERPASS 0xD1
#define MAPSEC_ALTERING_CAVE 0xD2

12
src/data/region_map/region_map_entries.h
View File

@ -251,9 +251,9 @@ const struct RegionMapLocation gRegionMapEntries[] = {
[MAPSEC_ROUTE_133] = {12, 10, 3, 1, sMapName_Route133},
[MAPSEC_ROUTE_134] = { 9, 10, 3, 1, sMapName_Route134},
[MAPSEC_UNDERWATER_124] = {20, 3, 4, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_125] = {20, 6, 3, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_126] = {23, 6, 3, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_127] = {23, 9, 4, 1, sMapName_Underwater},
[MAPSEC_UNDERWATER_126] = {20, 6, 3, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_127] = {23, 6, 3, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_128] = {23, 9, 4, 1, sMapName_Underwater},
[MAPSEC_UNDERWATER_SOOTOPOLIS] = {21, 7, 1, 1, sMapName_Underwater},
[MAPSEC_GRANITE_CAVE] = { 1, 13, 1, 1, sMapName_GraniteCave},
[MAPSEC_MT_CHIMNEY] = { 6, 2, 1, 1, sMapName_MtChimney},
@ -269,7 +269,7 @@ const struct RegionMapLocation gRegionMapEntries[] = {
[MAPSEC_AQUA_HIDEOUT_OLD] = {19, 3, 1, 1, sMapName_AquaHideoutOld},
[MAPSEC_SHOAL_CAVE] = {24, 4, 1, 1, sMapName_ShoalCave},
[MAPSEC_SEAFLOOR_CAVERN] = {24, 9, 1, 1, sMapName_SeafloorCavern},
[MAPSEC_UNDERWATER_128] = {24, 9, 1, 1, sMapName_Underwater},
[MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = {24, 9, 1, 1, sMapName_Underwater},
[MAPSEC_VICTORY_ROAD] = {27, 9, 1, 1, sMapName_VictoryRoad},
[MAPSEC_MIRAGE_ISLAND] = {17, 10, 1, 1, sMapName_MirageIsland},
[MAPSEC_CAVE_OF_ORIGIN] = {21, 7, 1, 1, sMapName_CaveOfOrigin},
@ -406,8 +406,8 @@ const struct RegionMapLocation gRegionMapEntries[] = {
[MAPSEC_MARINE_CAVE] = { 0, 0, 1, 1, sMapName_MarineCave},
[MAPSEC_UNDERWATER_MARINE_CAVE] = { 0, 0, 1, 1, sMapName_Underwater},
[MAPSEC_TERRA_CAVE] = { 0, 0, 1, 1, sMapName_TerraCave},
[MAPSEC_UNDERWATER_TERRA_CAVE] = { 0, 10, 1, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_UNK1] = {24, 3, 2, 2, sMapName_Underwater},
[MAPSEC_UNDERWATER_105] = { 0, 10, 1, 3, sMapName_Underwater},
[MAPSEC_UNDERWATER_125] = {24, 3, 2, 2, sMapName_Underwater},
[MAPSEC_UNDERWATER_129] = {24, 10, 2, 1, sMapName_Underwater},
[MAPSEC_DESERT_UNDERPASS] = { 2, 0, 1, 1, sMapName_DesertUnderpass},
[MAPSEC_ALTERING_CAVE] = { 6, 8, 1, 1, sMapName_AlteringCave},

8
src/data/wild_encounters.json
View File

@ -2265,8 +2265,8 @@
}
},
{
"map": "MAP_UNDERWATER2",
"base_label": "gUnderwater2",
"map": "MAP_UNDERWATER_ROUTE126",
"base_label": "gUnderwater_Route126",
"water_mons": {
"encounter_rate": 4,
"mons": [
@ -9075,8 +9075,8 @@
}
},
{
"map": "MAP_UNDERWATER1",
"base_label": "gUnderwater1",
"map": "MAP_UNDERWATER_ROUTE124",
"base_label": "gUnderwater_Route124",
"water_mons": {
"encounter_rate": 4,
"mons": [

10
src/field_specials.c
View File

@ -3649,14 +3649,14 @@ bool8 AbnormalWeatherHasExpired(void)
}
}
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER3))
if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(UNDERWATER_ROUTE127))
{
switch (gSaveBlock1Ptr->location.mapNum)
{
case MAP_NUM(UNDERWATER3):
case MAP_NUM(UNDERWATER5):
case MAP_NUM(UNDERWATER6):
case MAP_NUM(UNDERWATER7):
case MAP_NUM(UNDERWATER_ROUTE127):
case MAP_NUM(UNDERWATER_ROUTE129):
case MAP_NUM(UNDERWATER_ROUTE105):
case MAP_NUM(UNDERWATER_ROUTE125):
VarSet(VAR_SHOULD_END_ABNORMAL_WEATHER, 1);
return FALSE;
default:

8
src/map_name_popup.c
View File

@ -121,9 +121,9 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] =
[MAPSEC_ROUTE_133] = MAPPOPUP_THEME_UNDERWATER,
[MAPSEC_ROUTE_134] = MAPPOPUP_THEME_UNDERWATER,
[MAPSEC_UNDERWATER_124] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_125] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_126] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_127] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_128] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_SOOTOPOLIS] = MAPPOPUP_THEME_STONE2,
[MAPSEC_GRANITE_CAVE] = MAPPOPUP_THEME_STONE,
[MAPSEC_MT_CHIMNEY] = MAPPOPUP_THEME_STONE,
@ -139,7 +139,7 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] =
[MAPSEC_AQUA_HIDEOUT_OLD] = MAPPOPUP_THEME_STONE,
[MAPSEC_SHOAL_CAVE] = MAPPOPUP_THEME_STONE,
[MAPSEC_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_STONE,
[MAPSEC_UNDERWATER_128] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_SEAFLOOR_CAVERN] = MAPPOPUP_THEME_STONE2,
[MAPSEC_VICTORY_ROAD] = MAPPOPUP_THEME_STONE,
[MAPSEC_MIRAGE_ISLAND] = MAPPOPUP_THEME_WOOD,
[MAPSEC_CAVE_OF_ORIGIN] = MAPPOPUP_THEME_STONE,
@ -167,8 +167,8 @@ static const u8 gRegionMapSectionId_To_PopUpThemeIdMapping[] =
[MAPSEC_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,
[MAPSEC_UNDERWATER_MARINE_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
[MAPSEC_TERRA_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,
[MAPSEC_UNDERWATER_TERRA_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_UNK1 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_105 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_125 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
[MAPSEC_UNDERWATER_129 - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE2,
[MAPSEC_DESERT_UNDERPASS - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,
[MAPSEC_ALTERING_CAVE - KANTO_MAPSEC_COUNT] = MAPPOPUP_THEME_STONE,

16
src/region_map.c
View File

@ -129,15 +129,15 @@ static const u8 sRegionMap_MapSectionLayout[] = INCBIN_U8("graphics/pokenav/regi
static const u16 sRegionMap_SpecialPlaceLocations[][2] =
{
{MAPSEC_UNDERWATER_TERRA_CAVE, MAPSEC_ROUTE_105},
{MAPSEC_UNDERWATER_105, MAPSEC_ROUTE_105},
{MAPSEC_UNDERWATER_124, MAPSEC_ROUTE_124},
{MAPSEC_UNDERWATER_UNK1, MAPSEC_ROUTE_129},
{MAPSEC_UNDERWATER_125, MAPSEC_ROUTE_126},
{MAPSEC_UNDERWATER_126, MAPSEC_ROUTE_127},
{MAPSEC_UNDERWATER_127, MAPSEC_ROUTE_128},
{MAPSEC_UNDERWATER_125, MAPSEC_ROUTE_129}, // BUG: Map will incorrectly show player on Route 129 when diving on Route 125 (for Marine Cave only)
{MAPSEC_UNDERWATER_126, MAPSEC_ROUTE_126},
{MAPSEC_UNDERWATER_127, MAPSEC_ROUTE_127},
{MAPSEC_UNDERWATER_128, MAPSEC_ROUTE_128},
{MAPSEC_UNDERWATER_129, MAPSEC_ROUTE_129},
{MAPSEC_UNDERWATER_SOOTOPOLIS, MAPSEC_SOOTOPOLIS_CITY},
{MAPSEC_UNDERWATER_128, MAPSEC_ROUTE_128},
{MAPSEC_UNDERWATER_SEAFLOOR_CAVERN, MAPSEC_ROUTE_128},
{MAPSEC_AQUA_HIDEOUT, MAPSEC_LILYCOVE_CITY},
{MAPSEC_AQUA_HIDEOUT_OLD, MAPSEC_LILYCOVE_CITY},
{MAPSEC_MAGMA_HIDEOUT, MAPSEC_ROUTE_112},
@ -998,7 +998,7 @@ static void InitMapBasedOnPlayerLocation(void)
mapHeight = gMapHeader.mapLayout->height;
x = gSaveBlock1Ptr->pos.x;
y = gSaveBlock1Ptr->pos.y;
if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_128 || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE)
if (gRegionMap->mapSecId == MAPSEC_UNDERWATER_SEAFLOOR_CAVERN || gRegionMap->mapSecId == MAPSEC_UNDERWATER_MARINE_CAVE)
gRegionMap->playerIsInCave = TRUE;
break;
case MAP_TYPE_UNDERGROUND:
@ -1089,7 +1089,7 @@ static void InitMapBasedOnPlayerLocation(void)
x = 0;
break;
case MAPSEC_ROUTE_126:
case MAPSEC_UNDERWATER_125:
case MAPSEC_UNDERWATER_126:
x = 0;
if (gSaveBlock1Ptr->pos.x > 32)
x++;