Merge branch 'master' into doc-factscreen

45 files changed, 159 insertions, 155 deletions

diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
index 493588b4d..cc623e216 100644
--- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
+++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc
@@ -443,7 +443,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyMultis:: @ 82421F2
 	end
 
 BattleFrontier_BattleTowerBattleRoom_EventScript_WarpToLobbyLinkMultis:: @ 82421FC
-	tower_unklink
+	tower_closelink
 	warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_LOBBY, 255, 18, 6
 	waitstate
 	end
diff --git a/data/maps/FortreeCity/map.json b/data/maps/FortreeCity/map.json
index 86d43693a..fd23e6ffd 100644
--- a/data/maps/FortreeCity/map.json
+++ b/data/maps/FortreeCity/map.json
@@ -104,7 +104,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 25,
       "y": 8,
       "elevation": 3,
diff --git a/data/maps/LilycoveCity_House1/map.json b/data/maps/LilycoveCity_House1/map.json
index bd6850f5a..cbd7cdbdf 100644
--- a/data/maps/LilycoveCity_House1/map.json
+++ b/data/maps/LilycoveCity_House1/map.json
@@ -28,7 +28,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 4,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
index 667f44114..eb081dbbb 100644
--- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc
@@ -247,7 +247,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_Grunt2:: @ 822321F
 	copyobjectxytoperm LOCALID_STAIR_GRUNT
 	switch VAR_FACING
 	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsWest
-	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast  @ BUG: This was meant to be case DIR_EAST
+	#ifdef BUGFIX
+	case DIR_EAST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
+	#else
+	case DIR_WEST, MossdeepCity_SpaceCenter_1F_EventScript_MoveGruntFromStairsEast
+	#endif
 	applymovement LOCALID_STAIR_GRUNT, MossdeepCity_SpaceCenter_1F_Movement_MoveGruntFromStairs
 	waitmovement 0
 	setvar VAR_MOSSDEEP_SPACE_CENTER_STAIR_GUARD_STATE, 2
diff --git a/data/maps/MtChimney_CableCarStation/scripts.inc b/data/maps/MtChimney_CableCarStation/scripts.inc
index 6ce84933f..5eebdb767 100644
--- a/data/maps/MtChimney_CableCarStation/scripts.inc
+++ b/data/maps/MtChimney_CableCarStation/scripts.inc
@@ -46,7 +46,7 @@ MtChimney_CableCarStation_EventScript_RideCableCar:: @ 822AC6C
 	applymovement LOCALID_ATTENDANT, MtChimney_CableCarStation_Movement_LeadPlayerToCableCar
 	applymovement OBJ_EVENT_ID_PLAYER, MtChimney_CableCarStation_Movement_BoardCableCar
 	waitmovement 0
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, TRUE  @ Going down
 	setvar VAR_CABLE_CAR_STATION_STATE, 2
 	incrementgamestat GAME_STAT_RODE_CABLE_CAR
 	special CableCarWarp
diff --git a/data/maps/NewMauville_Inside/map.json b/data/maps/NewMauville_Inside/map.json
index eea119068..ae1654d8b 100644
--- a/data/maps/NewMauville_Inside/map.json
+++ b/data/maps/NewMauville_Inside/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "NewMauville_Inside_EventScript_ItemUltraRope",
+      "script": "NewMauville_Inside_EventScript_ItemUltraBall",
       "flag": "FLAG_ITEM_NEW_MAUVILLE_ULTRA_BALL"
     },
     {
diff --git a/data/maps/Route105/map.json b/data/maps/Route105/map.json
index bb6c7a653..bd951f62c 100644
--- a/data/maps/Route105/map.json
+++ b/data/maps/Route105/map.json
@@ -26,7 +26,7 @@
     {
       "direction": "dive",
       "offset": 0,
-      "map": "MAP_UNDERWATER6"
+      "map": "MAP_UNDERWATER_ROUTE105"
     }
   ],
   "object_events": [
diff --git a/data/maps/Route112_CableCarStation/scripts.inc b/data/maps/Route112_CableCarStation/scripts.inc
index b1da3e3cb..6781b154c 100644
--- a/data/maps/Route112_CableCarStation/scripts.inc
+++ b/data/maps/Route112_CableCarStation/scripts.inc
@@ -47,7 +47,7 @@ Route112_CableCarStation_EventScript_RideCableCar:: @ 822AB38
 	applymovement LOCALID_ATTENDANT, Route112_CableCarStation_Movement_LeadPlayerToCableCar
 	applymovement OBJ_EVENT_ID_PLAYER, Route112_CableCarStation_Movement_BoardCableCar
 	waitmovement 0
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FALSE  @ Going up
 	setvar VAR_CABLE_CAR_STATION_STATE, 1
 	incrementgamestat GAME_STAT_RODE_CABLE_CAR
 	special CableCarWarp
diff --git a/data/maps/Route117/map.json b/data/maps/Route117/map.json
index d2f45e256..dd923a7cd 100644
--- a/data/maps/Route117/map.json
+++ b/data/maps/Route117/map.json
@@ -78,7 +78,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 39,
       "y": 4,
       "elevation": 3,
diff --git a/data/maps/Route119/map.json b/data/maps/Route119/map.json
index fa6391a34..8d78d1065 100644
--- a/data/maps/Route119/map.json
+++ b/data/maps/Route119/map.json
@@ -468,7 +468,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 31,
       "y": 6,
       "elevation": 3,
@@ -481,7 +481,7 @@
       "flag": "FLAG_HIDE_ROUTE_119_KECLEON_1"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 25,
       "y": 15,
       "elevation": 3,
diff --git a/data/maps/Route120/map.json b/data/maps/Route120/map.json
index 8a7e56ddc..787f51361 100644
--- a/data/maps/Route120/map.json
+++ b/data/maps/Route120/map.json
@@ -403,7 +403,7 @@
       "flag": "FLAG_ITEM_ROUTE_120_HYPER_POTION"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 12,
       "y": 16,
       "elevation": 4,
@@ -412,8 +412,8 @@
       "movement_range_y": 1,
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route120_EventScript_InvisibleBridgeKecleon",
-      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_INVISIBLE"
+      "script": "Route120_EventScript_BridgeKecleon",
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE"
     },
     {
       "graphics_id": "OBJ_EVENT_GFX_STEVEN",
@@ -481,7 +481,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_2",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON_BRIDGE_SHADOW",
       "x": 12,
       "y": 16,
       "elevation": 3,
@@ -491,10 +491,10 @@
       "trainer_type": "TRAINER_TYPE_NONE",
       "trainer_sight_or_berry_tree_id": "0",
       "script": "0x0",
-      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_VISIBLE"
+      "flag": "FLAG_HIDE_ROUTE_120_KECLEON_BRIDGE_SHADOW"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 20,
       "y": 11,
       "elevation": 3,
@@ -507,7 +507,7 @@
       "flag": "FLAG_HIDE_ROUTE_120_KECLEON_1"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 27,
       "y": 2,
       "elevation": 3,
@@ -520,7 +520,7 @@
       "flag": "FLAG_HIDE_ROUTE_120_KECLEON_2"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 4,
       "y": 77,
       "elevation": 3,
@@ -533,7 +533,7 @@
       "flag": "FLAG_HIDE_ROUTE_120_KECLEON_3"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 7,
       "y": 51,
       "elevation": 3,
@@ -546,7 +546,7 @@
       "flag": "FLAG_HIDE_ROUTE_120_KECLEON_5"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 19,
       "y": 48,
       "elevation": 3,
diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc
index 7ec3e1221..0056acbd7 100644
--- a/data/maps/Route120/scripts.inc
+++ b/data/maps/Route120/scripts.inc
@@ -1,6 +1,6 @@
-.set LOCALID_INVISIBLE_BRIDGE_KECLEON, 30
+.set LOCALID_BRIDGE_KECLEON, 30
 .set LOCALID_STEVEN, 31
-.set LOCALID_VISIBLE_BRIDGE_KECLEON, 36
+.set LOCALID_BRIDGE_KECLEON_SHADOW, 36  @ They use a second object which is identical to Kecleon but has a reflection palette tag for the bridge shadow
 
 Route120_MapScripts:: @ 81F53EC
 	map_script MAP_SCRIPT_ON_RESUME, Route120_OnResume
@@ -31,8 +31,8 @@ Route120_EventScript_RemoveBridgeKecleon:: @ 81F5449
 	specialvar VAR_RESULT, GetBattleOutcome
 	compare VAR_RESULT, B_OUTCOME_CAUGHT
 	goto_if_ne Common_EventScript_NopReturn
-	removeobject LOCALID_INVISIBLE_BRIDGE_KECLEON
-	removeobject LOCALID_VISIBLE_BRIDGE_KECLEON
+	removeobject LOCALID_BRIDGE_KECLEON
+	removeobject LOCALID_BRIDGE_KECLEON_SHADOW
 	return
 
 Route120_EventScript_RemoveKecleon:: @ 81F5460
@@ -61,7 +61,7 @@ Route120_EventScript_SetBridgeClearMetatiles:: @ 81F54A3
 	return
 
 Route120_EventScript_SetBridgeKecleonMovement:: @ 81F54C8
-	setobjectmovementtype LOCALID_VISIBLE_BRIDGE_KECLEON, MOVEMENT_TYPE_FACE_RIGHT
+	setobjectmovementtype LOCALID_BRIDGE_KECLEON_SHADOW, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
 Route120_OnTransition: @ 81F54CD
@@ -205,9 +205,9 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B
 	delay 20
 	msgbox Route120_Text_StevenUsedDevonScope, MSGBOX_DEFAULT
 	closemessage
-	applymovement LOCALID_INVISIBLE_BRIDGE_KECLEON, Common_Movement_WalkInPlaceFastestRight
+	applymovement LOCALID_BRIDGE_KECLEON, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	applymovement LOCALID_INVISIBLE_BRIDGE_KECLEON, Movement_KecleonAppears
+	applymovement LOCALID_BRIDGE_KECLEON, Movement_KecleonAppears
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KECLEON, 2
@@ -230,8 +230,8 @@ Route120_EventScript_StevenBattleKecleon:: @ 81F568B
 
 Route120_EventScript_RemoveBridgeKecleonPostBattle:: @ 81F571C
 	fadescreenswapbuffers FADE_TO_BLACK
-	removeobject LOCALID_INVISIBLE_BRIDGE_KECLEON
-	removeobject LOCALID_VISIBLE_BRIDGE_KECLEON
+	removeobject LOCALID_BRIDGE_KECLEON
+	removeobject LOCALID_BRIDGE_KECLEON_SHADOW
 	fadescreenswapbuffers FADE_FROM_BLACK
 	goto Route120_EventScript_StevenGiveDeconScope
 	end
@@ -276,7 +276,7 @@ Route120_Movement_ApproachKecleonWest: @ 81F57B9
 	walk_left
 	step_end
 
-Route120_EventScript_InvisibleBridgeKecleon:: @ 81F57BC
+Route120_EventScript_BridgeKecleon:: @ 81F57BC
 	msgbox Kecleon_Text_SomethingUnseeable, MSGBOX_NPC
 	end
 
diff --git a/data/maps/Route124/map.json b/data/maps/Route124/map.json
index cb075d29a..370a5f4e4 100644
--- a/data/maps/Route124/map.json
+++ b/data/maps/Route124/map.json
@@ -36,7 +36,7 @@
     {
       "direction": "dive",
       "offset": 0,
-      "map": "MAP_UNDERWATER1"
+      "map": "MAP_UNDERWATER_ROUTE124"
     }
   ],
   "object_events": [
diff --git a/data/maps/Route125/map.json b/data/maps/Route125/map.json
index 984a554e4..719e6b699 100644
--- a/data/maps/Route125/map.json
+++ b/data/maps/Route125/map.json
@@ -26,7 +26,7 @@
     {
       "direction": "dive",
       "offset": 0,
-      "map": "MAP_UNDERWATER7"
+      "map": "MAP_UNDERWATER_ROUTE125"
     }
   ],
   "object_events": [
diff --git a/data/maps/Route126/map.json b/data/maps/Route126/map.json
index 60b439066..bf7d7027c 100644
--- a/data/maps/Route126/map.json
+++ b/data/maps/Route126/map.json
@@ -26,7 +26,7 @@
     {
       "direction": "dive",
       "offset": 0,
-      "map": "MAP_UNDERWATER2"
+      "map": "MAP_UNDERWATER_ROUTE126"
     }
   ],
   "object_events": [
diff --git a/data/maps/Route127/map.json b/data/maps/Route127/map.json
index 0e6d78da7..6ef7022f4 100644
--- a/data/maps/Route127/map.json
+++ b/data/maps/Route127/map.json
@@ -31,7 +31,7 @@
     {
       "direction": "dive",
       "offset": 0,
-      "map": "MAP_UNDERWATER3"
+      "map": "MAP_UNDERWATER_ROUTE127"
     }
   ],
   "object_events": [
diff --git a/data/maps/Route128/map.json b/data/maps/Route128/map.json
index d8fbb249a..0bed932d5 100644
--- a/data/maps/Route128/map.json
+++ b/data/maps/Route128/map.json
@@ -31,7 +31,7 @@
     {
       "direction": "dive",
       "offset": 0,
-      "map": "MAP_UNDERWATER4"
+      "map": "MAP_UNDERWATER_ROUTE128"
     }
   ],
   "object_events": [
diff --git a/data/maps/Route129/map.json b/data/maps/Route129/map.json
index ca814b465..d5383eb50 100644
--- a/data/maps/Route129/map.json
+++ b/data/maps/Route129/map.json
@@ -26,7 +26,7 @@
     {
       "direction": "dive",
       "offset": 0,
-      "map": "MAP_UNDERWATER5"
+      "map": "MAP_UNDERWATER_ROUTE129"
     }
   ],
   "object_events": [
diff --git a/data/maps/SeafloorCavern_Entrance/map.json b/data/maps/SeafloorCavern_Entrance/map.json
index a80fce6c1..1f7095def 100644
--- a/data/maps/SeafloorCavern_Entrance/map.json
+++ b/data/maps/SeafloorCavern_Entrance/map.json
@@ -33,7 +33,7 @@
       "x": 10,
       "y": 18,
       "elevation": 3,
-      "dest_map": "MAP_UNDERWATER4",
+      "dest_map": "MAP_UNDERWATER_ROUTE128",
       "dest_warp_id": 0
     },
     {
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index 6ef9c3d57..e6ceb6418 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -235,7 +235,7 @@ SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
 	fadescreenspeed FADE_TO_BLACK, 8
 	setweather WEATHER_ABNORMAL
 	doweather
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene
 	special Script_DoRayquazaScene
 	waitstate
 	applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFastestLeft
@@ -335,7 +335,7 @@ SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
 	fadescreenspeed FADE_TO_BLACK, 8
 	setweather WEATHER_ABNORMAL
 	doweather
-	setvar VAR_0x8004, 0
+	setvar VAR_0x8004, FALSE @ Just do Groudon/Kyogre fight scene
 	special Script_DoRayquazaScene
 	waitstate
 	applymovement LOCALID_KYOGRE, Common_Movement_WalkInPlaceFastestLeft
@@ -528,7 +528,7 @@ SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
 	removeobject LOCALID_GROUDON
 	removeobject LOCALID_KYOGRE
 	addobject LOCALID_RAYQUAZA
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, TRUE
 	special Script_DoRayquazaScene
 	waitstate
 	playse SE_THUNDER
@@ -581,7 +581,7 @@ SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
 	removeobject LOCALID_GROUDON
 	removeobject LOCALID_KYOGRE
 	addobject LOCALID_RAYQUAZA
-	setvar VAR_0x8004, 1
+	setvar VAR_0x8004, TRUE
 	special Script_DoRayquazaScene
 	waitstate
 	special SpawnCameraObject
diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json
index 26c47c432..29162b867 100644
--- a/data/maps/SootopolisCity_House1/map.json
+++ b/data/maps/SootopolisCity_House1/map.json
@@ -28,7 +28,7 @@
       "flag": "0"
     },
     {
-      "graphics_id": "OBJ_EVENT_GFX_KECLEON_1",
+      "graphics_id": "OBJ_EVENT_GFX_KECLEON",
       "x": 2,
       "y": 3,
       "elevation": 3,
diff --git a/data/maps/Underwater1/scripts.inc b/data/maps/Underwater1/scripts.inc
deleted file mode 100644
index 107a038a8..000000000
--- a/data/maps/Underwater1/scripts.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-Underwater1_MapScripts:: @ 81F7722
-	.byte 0
-
diff --git a/data/maps/Underwater2/scripts.inc b/data/maps/Underwater2/scripts.inc
deleted file mode 100644
index 80c854c63..000000000
--- a/data/maps/Underwater2/scripts.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-Underwater2_MapScripts:: @ 81F7723
-	.byte 0
-
diff --git a/data/maps/Underwater3/scripts.inc b/data/maps/Underwater3/scripts.inc
deleted file mode 100644
index e75acd635..000000000
--- a/data/maps/Underwater3/scripts.inc
+++ /dev/null
@@ -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
-
diff --git a/data/maps/Underwater4/scripts.inc b/data/maps/Underwater4/scripts.inc
deleted file mode 100644
index 295c27356..000000000
--- a/data/maps/Underwater4/scripts.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-Underwater4_MapScripts:: @ 81F7730
-	.byte 0
-
diff --git a/data/maps/Underwater5/scripts.inc b/data/maps/Underwater5/scripts.inc
deleted file mode 100644
index 235d25aba..000000000
--- a/data/maps/Underwater5/scripts.inc
+++ /dev/null
@@ -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
-
diff --git a/data/maps/Underwater6/scripts.inc b/data/maps/Underwater6/scripts.inc
deleted file mode 100644
index 21b639cd8..000000000
--- a/data/maps/Underwater6/scripts.inc
+++ /dev/null
@@ -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
-
diff --git a/data/maps/Underwater7/scripts.inc b/data/maps/Underwater7/scripts.inc
deleted file mode 100644
index 4215dced9..000000000
--- a/data/maps/Underwater7/scripts.inc
+++ /dev/null
@@ -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
-
diff --git a/data/maps/Underwater6/map.json b/data/maps/Underwater_Route105/map.json
index 2a021f77f..890ccb2a8 100644
--- a/data/maps/Underwater6/map.json
+++ b/data/maps/Underwater_Route105/map.json
@@ -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",
diff --git a/data/maps/Underwater_Route105/scripts.inc b/data/maps/Underwater_Route105/scripts.inc
new file mode 100644
index 000000000..41cd8bfbe
--- /dev/null
+++ b/data/maps/Underwater_Route105/scripts.inc
@@ -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
+
diff --git a/data/maps/Underwater1/map.json b/data/maps/Underwater_Route124/map.json
index 71752745d..46bc141a8 100644
--- a/data/maps/Underwater1/map.json
+++ b/data/maps/Underwater_Route124/map.json
@@ -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"
     }
   ]
 }
diff --git a/data/maps/Underwater_Route124/scripts.inc b/data/maps/Underwater_Route124/scripts.inc
new file mode 100644
index 000000000..2a72dfb11
--- /dev/null
+++ b/data/maps/Underwater_Route124/scripts.inc
@@ -0,0 +1,3 @@
+Underwater_Route124_MapScripts:: @ 81F7722
+	.byte 0
+
diff --git a/data/maps/Underwater7/map.json b/data/maps/Underwater_Route125/map.json
index 5155fc6ba..c32bb57e8 100644
--- a/data/maps/Underwater7/map.json
+++ b/data/maps/Underwater_Route125/map.json
@@ -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",
diff --git a/data/maps/Underwater_Route125/scripts.inc b/data/maps/Underwater_Route125/scripts.inc
new file mode 100644
index 000000000..662120e5e
--- /dev/null
+++ b/data/maps/Underwater_Route125/scripts.inc
@@ -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
+
diff --git a/data/maps/Underwater2/map.json b/data/maps/Underwater_Route126/map.json
index 5ecdc402a..993bb7907 100644
--- a/data/maps/Underwater2/map.json
+++ b/data/maps/Underwater_Route126/map.json
@@ -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"
     }
   ]
 }
diff --git a/data/maps/Underwater_Route126/scripts.inc b/data/maps/Underwater_Route126/scripts.inc
new file mode 100644
index 000000000..71d43e141
--- /dev/null
+++ b/data/maps/Underwater_Route126/scripts.inc
@@ -0,0 +1,3 @@
+Underwater_Route126_MapScripts:: @ 81F7723
+	.byte 0
+
diff --git a/data/maps/Underwater3/map.json b/data/maps/Underwater_Route127/map.json
index 43df933a0..b96f79c5d 100644
--- a/data/maps/Underwater3/map.json
+++ b/data/maps/Underwater_Route127/map.json
@@ -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"
     }
   ]
 }
diff --git a/data/maps/Underwater_Route127/scripts.inc b/data/maps/Underwater_Route127/scripts.inc
new file mode 100644
index 000000000..552b9aab8
--- /dev/null
+++ b/data/maps/Underwater_Route127/scripts.inc
@@ -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
+
diff --git a/data/maps/Underwater4/map.json b/data/maps/Underwater_Route128/map.json
index 4b0fc6d3b..f80cf41a6 100644
--- a/data/maps/Underwater4/map.json
+++ b/data/maps/Underwater_Route128/map.json
@@ -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"
     }
   ]
 }
diff --git a/data/maps/Underwater_Route128/scripts.inc b/data/maps/Underwater_Route128/scripts.inc
new file mode 100644
index 000000000..a050afd93
--- /dev/null
+++ b/data/maps/Underwater_Route128/scripts.inc
@@ -0,0 +1,3 @@
+Underwater_Route128_MapScripts:: @ 81F7730
+	.byte 0
+
diff --git a/data/maps/Underwater5/map.json b/data/maps/Underwater_Route129/map.json
index 909591f11..45775bd6b 100644
--- a/data/maps/Underwater5/map.json
+++ b/data/maps/Underwater_Route129/map.json
@@ -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,
diff --git a/data/maps/Underwater_Route129/scripts.inc b/data/maps/Underwater_Route129/scripts.inc
new file mode 100644
index 000000000..f9f84841e
--- /dev/null
+++ b/data/maps/Underwater_Route129/scripts.inc
@@ -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
+
diff --git a/data/maps/Underwater_SeafloorCavern/map.json b/data/maps/Underwater_SeafloorCavern/map.json
index efcb3c291..d25a3600d 100644
--- a/data/maps/Underwater_SeafloorCavern/map.json
+++ b/data/maps/Underwater_SeafloorCavern/map.json
@@ -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
     }
   ],
diff --git a/data/maps/Underwater_SootopolisCity/map.json b/data/maps/Underwater_SootopolisCity/map.json
index 90e5e97fc..0d1363ff6 100644
--- a/data/maps/Underwater_SootopolisCity/map.json
+++ b/data/maps/Underwater_SootopolisCity/map.json
@@ -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
     }
   ],
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 2821ad20f..4201e814f 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -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",