Document Routes 111-118

data/maps/Route101/scripts.inc

@@ -1,13 +1,13 @@
 Route101_MapScripts:: @ 81EBCBA
 	map_script MAP_SCRIPT_ON_TRANSITION, Route101_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_MapScript2_1EBCCB
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route101_OnFrame
 	.byte 0
 
 Route101_OnTransition: @ 81EBCC5
 	call ProfBirch_EventScript_UpdateLocation
 	end
 
-Route101_MapScript2_1EBCCB: @ 81EBCCB
+Route101_OnFrame: @ 81EBCCB
 	map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_HideMapNamePopup
 	.2byte 0
 

data/maps/Route110/scripts.inc

@@ -309,11 +309,11 @@ Route110_EventScript_CyclingChallengeEnd:: @ 81EF661
 	lockall
 	applymovement 21, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	call Route110_EventScript_1EF673
+	call Route110_EventScript_CyclingChallengeResults
 	releaseall
 	end
 
-Route110_EventScript_1EF673:: @ 81EF673
+Route110_EventScript_CyclingChallengeResults:: @ 81EF673
 	special FinishCyclingRoadChallenge
 	msgbox Route110_Text_CyclingChallengeResultSummary, MSGBOX_DEFAULT
 	switch VAR_RESULT

data/maps/Route111/map.json

@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F0FC5",
+      "script": "Route111_EventScript_Victor",
       "flag": "FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F121B",
+      "script": "Route111_EventScript_Heidi",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F1189",
+      "script": "Route111_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1204",
+      "script": "Route111_EventScript_Drew",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F1260",
+      "script": "Route111_EventScript_Dusty",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route111_EventScript_1F1232",
+      "script": "Route111_EventScript_Beau",
       "flag": "0"
     },
     {
@@ -183,7 +183,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1249",
+      "script": "Route111_EventScript_Becky",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F0EB9",
+      "script": "Route111_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -391,7 +391,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F12D9",
+      "script": "Route111_EventScript_Irene",
       "flag": "0"
     },
     {
@@ -404,7 +404,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F12C2",
+      "script": "Route111_EventScript_Travis",
       "flag": "0"
     },
     {
@@ -417,7 +417,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F12F0",
+      "script": "Route111_EventScript_Daisuke",
       "flag": "0"
     },
     {
@@ -430,7 +430,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route111_EventScript_1F1369",
+      "script": "Route111_EventScript_Brooke",
       "flag": "0"
     },
     {
@@ -443,7 +443,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F1307",
+      "script": "Route111_EventScript_Wilton",
       "flag": "0"
     },
     {
@@ -469,7 +469,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F1192",
+      "script": "Route111_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -482,7 +482,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route111_EventScript_1F13F9",
+      "script": "Route111_EventScript_Tyron",
       "flag": "0"
     },
     {
@@ -495,7 +495,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route111_EventScript_1F1410",
+      "script": "Route111_EventScript_Celina",
       "flag": "0"
     },
     {
@@ -508,7 +508,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route111_EventScript_1F13E2",
+      "script": "Route111_EventScript_Bianca",
       "flag": "0"
     },
     {
@@ -521,7 +521,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route111_EventScript_1F13CB",
+      "script": "Route111_EventScript_Hayden",
       "flag": "0"
     },
     {
@@ -534,7 +534,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route111_EventScript_1F143E",
+      "script": "Route111_EventScript_Bryan",
       "flag": "0"
     },
     {
@@ -547,7 +547,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route111_EventScript_1F1427",
+      "script": "Route111_EventScript_Celia",
       "flag": "0"
     },
     {
@@ -560,7 +560,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "7",
-      "script": "Route111_EventScript_1F1455",
+      "script": "Route111_EventScript_Branden",
       "flag": "0"
     },
     {
@@ -586,7 +586,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F119B",
+      "script": "Route111_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -625,7 +625,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route111_EventScript_1F11E4",
+      "script": "Route111_EventScript_RockSmashTipFatMan",
       "flag": "FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY"
     }
   ],
@@ -674,7 +674,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -683,7 +683,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -692,7 +692,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -701,7 +701,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -710,7 +710,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -719,7 +719,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -728,7 +728,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -737,7 +737,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -746,7 +746,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -755,7 +755,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F0A"
+      "script": "Route111_EventScript_ViciousSandstormTriggerDown"
     },
     {
       "type": "trigger",
@@ -764,7 +764,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -773,7 +773,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -782,7 +782,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -791,7 +791,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -800,7 +800,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -809,7 +809,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0F16"
+      "script": "Route111_EventScript_ViciousSandstormTriggerLeft"
     },
     {
       "type": "trigger",
@@ -818,7 +818,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -827,7 +827,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -836,7 +836,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -845,7 +845,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -854,7 +854,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -863,7 +863,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -872,7 +872,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FB0"
+      "script": "Route111_EventScript_SunTrigger"
     },
     {
       "type": "trigger",
@@ -881,7 +881,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -890,7 +890,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -899,7 +899,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -908,7 +908,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -917,7 +917,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -926,7 +926,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -935,7 +935,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -944,7 +944,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -953,7 +953,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -962,7 +962,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     },
     {
       "type": "trigger",
@@ -971,7 +971,7 @@
       "elevation": 3,
       "var": "0",
       "var_value": "0",
-      "script": "Route111_EventScript_1F0FBD"
+      "script": "Route111_EventScript_SandstormTrigger"
     }
   ],
   "bg_events": [
@@ -981,7 +981,7 @@
       "y": 114,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F115C"
+      "script": "Route111_EventScript_WinstrateHouseSign"
     },
     {
       "type": "sign",
@@ -989,7 +989,7 @@
       "y": 126,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1153"
+      "script": "Route111_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -997,7 +997,7 @@
       "y": 66,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1165"
+      "script": "Route111_EventScript_RouteSign112"
     },
     {
       "type": "sign",
@@ -1005,7 +1005,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F116E"
+      "script": "Route111_EventScript_RouteSign113"
     },
     {
       "type": "secret_base",
@@ -1034,7 +1034,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1177"
+      "script": "Route111_EventScript_OldLadysRestStopSign"
     },
     {
       "type": "secret_base",
@@ -1071,7 +1071,7 @@
       "y": 84,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F1180"
+      "script": "Route111_EventScript_TrainerTipsSpAtkSpDef"
     },
     {
       "type": "secret_base",
@@ -1109,7 +1109,7 @@
       "y": 116,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route111_EventScript_1F146C"
+      "script": "Route111_EventScript_TrainerHillSign"
     }
   ]
 }

data/maps/Route111/scripts.inc

@@ -1,22 +1,23 @@
 Route111_MapScripts:: @ 81F0CA7
-	map_script MAP_SCRIPT_ON_LOAD, Route111_MapScript1_1F0CBC
+	map_script MAP_SCRIPT_ON_LOAD, Route111_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route111_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_MapScript2_1F0E46
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route111_OnWarp
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_MapScript2_1F0E56
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route111_OnFrame
 	.byte 0
 
-Route111_MapScript1_1F0CBC: @ 81F0CBC
+Route111_OnLoad: @ 81F0CBC
-	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1
+	call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_CloseDesertRuins
 	compare VAR_MIRAGE_TOWER_STATE, 1
-	call_if_eq Route111_EventScript_1F0CE4
+	call_if_eq Route111_EventScript_ShowTemporaryMirageTower
 	end
 
-Route111_EventScript_1F0CD1:: @ 81F0CD1
+Route111_EventScript_CloseDesertRuins:: @ 81F0CD1
 	setmetatile 29, 86, METATILE_General_RockWall_RockBase, 1
 	setmetatile 29, 87, METATILE_General_RockWall_SandBase, 1
 	return
 
-Route111_EventScript_1F0CE4:: @ 81F0CE4
+@ Show Mirage Tower just prior to disintegration. Mirage Tower is otherwise handled by the map layout
+Route111_EventScript_ShowTemporaryMirageTower:: @ 81F0CE4
 	setmetatile 18, 53, METATILE_Mauville_MirageTower_Tile0, 0
 	setmetatile 19, 53, METATILE_Mauville_MirageTower_Tile1, 0
 	setmetatile 20, 53, METATILE_Mauville_MirageTower_Tile2, 0
@@ -40,53 +41,51 @@ Route111_EventScript_1F0CE4:: @ 81F0CE4
 Route111_OnTransition: @ 81F0D87
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special SetMirageTowerVisibility
-	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F0E3C
+	call_if_unset FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_SetLayoutNoMirageTower
 	compare VAR_MIRAGE_TOWER_STATE, 1
-	call_if_eq Route111_EventScript_1F0DC2
+	call_if_eq Route111_EventScript_SetFallingPlayerGfx
 	compare VAR_MIRAGE_TOWER_STATE, 2
-	call_if_eq Route111_EventScript_1F0E40
+	call_if_eq Route111_EventScript_SetMirageTowerGone
-	call Route111_EventScript_1F0DE6
+	call Route111_EventScript_CheckSetSandstorm
 	call GabbyAndTy_EventScript_UpdateLocation
 	checktrainerflag TRAINER_VICKY
-	goto_if_lt Route111_EventScript_1F0E26
+	goto_if_lt Route111_EventScript_SetWinstratesNotDefeated
 	end
 
-Route111_EventScript_1F0DC2:: @ 81F0DC2
+Route111_EventScript_SetFallingPlayerGfx:: @ 81F0DC2
 	checkplayergender
 	compare VAR_RESULT, MALE
-	goto_if_eq Route111_EventScript_1F0DDA
+	goto_if_eq Route111_EventScript_SetFallingPlayerGfxMale
 	compare VAR_RESULT, FEMALE
-	goto_if_eq Route111_EventScript_1F0DE0
+	goto_if_eq Route111_EventScript_SetFallingPlayerGfxFemale
 	return
 
-Route111_EventScript_1F0DDA:: @ 81F0DDA
+Route111_EventScript_SetFallingPlayerGfxMale:: @ 81F0DDA
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
 	return
 
-Route111_EventScript_1F0DE0:: @ 81F0DE0
+Route111_EventScript_SetFallingPlayerGfxFemale:: @ 81F0DE0
 	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
 	return
 
-Route111_EventScript_1F0DE6:: @ 81F0DE6
+Route111_EventScript_CheckSetSandstorm:: @ 81F0DE6
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_1, 34
-	goto_if_lt Route111_EventScript_1F0E25
+	goto_if_lt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_1, 107
-	goto_if_gt Route111_EventScript_1F0E25
+	goto_if_gt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_1, 72
-	goto_if_gt Route111_EventScript_1F0E22
+	goto_if_gt Route111_EventScript_SetSandstorm
 	compare VAR_TEMP_0, 2000
-	goto_if_gt Route111_EventScript_1F0E25
+	goto_if_gt Route111_EventScript_EndCheckSetSandstorm
 	compare VAR_TEMP_0, 8
-	goto_if_lt Route111_EventScript_1F0E25
+	goto_if_lt Route111_EventScript_EndCheckSetSandstorm
-
+Route111_EventScript_SetSandstorm:: @ 81F0E22
-Route111_EventScript_1F0E22:: @ 81F0E22
 	setweather WEATHER_SANDSTORM
-
+Route111_EventScript_EndCheckSetSandstorm:: @ 81F0E25
-Route111_EventScript_1F0E25:: @ 81F0E25
 	return
 
-Route111_EventScript_1F0E26:: @ 81F0E26
+Route111_EventScript_SetWinstratesNotDefeated:: @ 81F0E26
 	clearflag FLAG_HIDE_ROUTE_111_VICTOR_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VICTORIA_WINSTRATE
 	setflag FLAG_HIDE_ROUTE_111_VIVI_WINSTRATE
@@ -96,27 +95,27 @@ Route111_EventScript_1F0E26:: @ 81F0E26
 	cleartrainerflag TRAINER_VIVI
 	end
 
-Route111_EventScript_1F0E3C:: @ 81F0E3C
+Route111_EventScript_SetLayoutNoMirageTower:: @ 81F0E3C
 	setmaplayoutindex LAYOUT_ROUTE111_NO_MIRAGE_TOWER
 	return
 
-Route111_EventScript_1F0E40:: @ 81F0E40
+Route111_EventScript_SetMirageTowerGone:: @ 81F0E40
 	setvar VAR_MIRAGE_TOWER_STATE, 3
 	return
 
-Route111_MapScript2_1F0E46: @ 81F0E46
+Route111_OnWarp: @ 81F0E46
-	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E50
+	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_HidePlayerForMirageTower
 	.2byte 0
 
-Route111_EventScript_1F0E50:: @ 81F0E50
+Route111_EventScript_HidePlayerForMirageTower:: @ 81F0E50
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_LITTLEROOT_TOWN
 	end
 
-Route111_MapScript2_1F0E56: @ 81F0E56
+Route111_OnFrame: @ 81F0E56
-	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_1F0E60
+	map_script_2 VAR_MIRAGE_TOWER_STATE, 1, Route111_EventScript_MirageTowerDisappear
 	.2byte 0
 
-Route111_EventScript_1F0E60:: @ 81F0E60
+Route111_EventScript_MirageTowerDisappear:: @ 81F0E60
 	lockall
 	special StartMirageTowerShake
 	waitstate
@@ -136,17 +135,18 @@ Route111_EventScript_1F0E60:: @ 81F0E60
 	waitstate
 	setvar VAR_MIRAGE_TOWER_STATE, 2
 	clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL
-	goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_1F0EA7
+	goto_if_set FLAG_CHOSE_CLAW_FOSSIL, Route111_EventScript_RootFossilDisappeared
-	msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT
+	msgbox Route111_Text_ClawFossilDisappeared, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route111_EventScript_1F0EA7:: @ 81F0EA7
+Route111_EventScript_RootFossilDisappeared:: @ 81F0EA7
-	msgbox Route111_Text_1F1C9F, MSGBOX_DEFAULT
+	msgbox Route111_Text_RootFossilDisappeared, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route111_Movement_1F0EB1:: @ 81F0EB1
+@ Unused
+Route111_Movement_PlayerFall:: @ 81F0EB1
 	store_lock_anim
 	walk_fast_down
 	walk_fast_down
@@ -156,498 +156,500 @@ Route111_Movement_1F0EB1:: @ 81F0EB1
 	walk_fast_down
 	step_end
 
-Route111_EventScript_1F0EB9:: @ 81F0EB9
+Route111_EventScript_Girl:: @ 81F0EB9
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_1F0EF4
+	goto_if_set FLAG_DAILY_ROUTE_111_RECEIVED_BERRY, Route111_EventScript_ReceivedBerry
-	msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT
+	msgbox Route111_Text_WateredPlantsEveryDayTakeBerry, MSGBOX_DEFAULT
 	giveitem_std ITEM_RAZZ_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_111_RECEIVED_BERRY
 	special GetPlayerBigGuyGirlString
-	msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT
+	msgbox Route111_Text_GoingToTryToMakeDifferentColorBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0EF4:: @ 81F0EF4
+Route111_EventScript_ReceivedBerry:: @ 81F0EF4
-	msgbox Route111_Text_2A6F9A, MSGBOX_DEFAULT
+	msgbox Route111_Text_WhatColorBerriesToLookForToday, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0EFE:: @ 81F0EFE
+@ Unused
+Route111_EventScript_ViciousSandstormTriggerUp:: @ 81F0EFE
 	lockall
 	setvar VAR_0x8004, 0
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F0A:: @ 81F0F0A
+Route111_EventScript_ViciousSandstormTriggerDown:: @ 81F0F0A
 	lockall
 	setvar VAR_0x8004, 1
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F16:: @ 81F0F16
+Route111_EventScript_ViciousSandstormTriggerLeft:: @ 81F0F16
 	lockall
 	setvar VAR_0x8004, 2
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F22:: @ 81F0F22
+@ Unused
+Route111_EventScript_ViciousSandstormTriggerRight:: @ 81F0F22
 	lockall
 	setvar VAR_0x8004, 3
-	goto Route111_EventScript_1F0F2E
+	goto Route111_EventScript_ViciousSandstormTrigger
 	end
 
-Route111_EventScript_1F0F2E:: @ 81F0F2E
+Route111_EventScript_ViciousSandstormTrigger:: @ 81F0F2E
 	checkitem ITEM_GO_GOGGLES, 1
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if_eq Route111_EventScript_1F0F45
+	goto_if_eq Route111_EventScript_PreventRouteAccess
 	setvar VAR_TEMP_3, 1
 	releaseall
 	end
 
-Route111_EventScript_1F0F45:: @ 81F0F45
+Route111_EventScript_PreventRouteAccess:: @ 81F0F45
 	msgbox gText_SandstormIsVicious, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8004, 0
-	call_if_eq Route111_EventScript_1F0F7C
+	call_if_eq Route111_EventScript_PushUpFromRoute
 	compare VAR_0x8004, 1
-	call_if_eq Route111_EventScript_1F0F87
+	call_if_eq Route111_EventScript_PushDownFromRoute
 	compare VAR_0x8004, 2
-	call_if_eq Route111_EventScript_1F0F92
+	call_if_eq Route111_EventScript_PushLeftFromRoute
 	compare VAR_0x8004, 3
-	call_if_eq Route111_EventScript_1F0F9D
+	call_if_eq Route111_EventScript_PushRightFromRoute
 	releaseall
 	end
 
-Route111_EventScript_1F0F7C:: @ 81F0F7C
+Route111_EventScript_PushUpFromRoute:: @ 81F0F7C
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FA8
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushUpFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F87:: @ 81F0F87
+Route111_EventScript_PushDownFromRoute:: @ 81F0F87
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAA
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushDownFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F92:: @ 81F0F92
+Route111_EventScript_PushLeftFromRoute:: @ 81F0F92
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAC
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushLeftFromRoute
 	waitmovement 0
 	return
 
-Route111_EventScript_1F0F9D:: @ 81F0F9D
+Route111_EventScript_PushRightFromRoute:: @ 81F0F9D
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F0FAE
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_PushRightFromRoute
 	waitmovement 0
 	return
 
-Route111_Movement_1F0FA8: @ 81F0FA8
+Route111_Movement_PushUpFromRoute: @ 81F0FA8
 	walk_up
 	step_end
 
-Route111_Movement_1F0FAA: @ 81F0FAA
+Route111_Movement_PushDownFromRoute: @ 81F0FAA
 	walk_down
 	step_end
 
-Route111_Movement_1F0FAC: @ 81F0FAC
+Route111_Movement_PushLeftFromRoute: @ 81F0FAC
 	walk_left
 	step_end
 
-Route111_Movement_1F0FAE: @ 81F0FAE
+Route111_Movement_PushRightFromRoute: @ 81F0FAE
 	walk_right
 	step_end
 
-Route111_EventScript_1F0FB0:: @ 81F0FB0
+Route111_EventScript_SunTrigger:: @ 81F0FB0
 	setweather WEATHER_SUNNY
 	fadenewbgm MUS_DOORO_X1
 	doweather
 	setvar VAR_TEMP_3, 0
 	end
 
-Route111_EventScript_1F0FBD:: @ 81F0FBD
+Route111_EventScript_SandstormTrigger:: @ 81F0FBD
 	setweather WEATHER_SANDSTORM
 	fadenewbgm MUS_ASHROAD
 	doweather
 	end
 
-Route111_EventScript_1F0FC5:: @ 81F0FC5
+Route111_EventScript_Victor:: @ 81F0FC5
 	lock
 	faceplayer
 	setflag FLAG_LANDMARK_WINSTRATE_FAMILY
-	msgbox Route111_Text_1F1475, MSGBOX_YESNO
+	msgbox Route111_Text_BattleOurFamily, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq Route111_EventScript_1F0FE7
+	goto_if_eq Route111_EventScript_BattleWinstrates
-	msgbox Route111_Text_1F14F5, MSGBOX_DEFAULT
+	msgbox Route111_Text_IsThatSo, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F0FE7:: @ 81F0FE7
+Route111_EventScript_BattleWinstrates:: @ 81F0FE7
-	msgbox Route111_Text_1F1523, MSGBOX_DEFAULT
+	msgbox Route111_Text_VictorIntro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_1F1542
+	trainerbattle_no_intro TRAINER_VICTOR, Route111_Text_VictorDefeat
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
-	msgbox Route111_Text_1F156F, MSGBOX_DEFAULT
+	msgbox Route111_Text_VictorPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route111_Movement_1F114A
+	applymovement 1, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 1
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 2
-	applymovement 2, Route111_Movement_1F114D
+	applymovement 2, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
-	msgbox Route111_Text_1F159D, MSGBOX_DEFAULT
+	msgbox Route111_Text_VictoriaIntro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_1F1616
+	trainerbattle_no_intro TRAINER_VICTORIA, Route111_Text_VictoriaDefeat
 	applymovement 2, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
-	msgbox Route111_Text_1F1645, MSGBOX_DEFAULT
+	msgbox Route111_Text_VictoriaPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 2, Route111_Movement_1F114A
+	applymovement 2, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 2
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 3
-	applymovement 3, Route111_Movement_1F114D
+	applymovement 3, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
-	msgbox Route111_Text_1F167E, MSGBOX_DEFAULT
+	msgbox Route111_Text_ViviIntro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_1F16C6
+	trainerbattle_no_intro TRAINER_VIVI, Route111_Text_ViviDefeat
 	applymovement 3, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
-	msgbox Route111_Text_1F16DC, MSGBOX_DEFAULT
+	msgbox Route111_Text_ViviPostBattle, MSGBOX_DEFAULT
 	closemessage
-	applymovement 3, Route111_Movement_1F114A
+	applymovement 3, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 3
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
-	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_1F114F
+	applymovement EVENT_OBJ_ID_PLAYER, Route111_Movement_WaitForNextWinstrate
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
 	addobject 4
-	applymovement 4, Route111_Movement_1F114D
+	applymovement 4, Route111_Movement_WinstrateExitHouse
 	waitmovement 0
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
-	msgbox Route111_Text_1F16FB, MSGBOX_DEFAULT
+	msgbox Route111_Text_VickyIntro, MSGBOX_DEFAULT
-	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_1F1756
+	trainerbattle_no_intro TRAINER_VICKY, Route111_Text_VickyDefeat
-	msgbox Route111_Text_1F1788, MSGBOX_DEFAULT
+	msgbox Route111_Text_VickyPostBattle, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	call Route111_EventScript_1F113C
+	call Route111_EventScript_OpenWinstrateDoor
-	applymovement 4, Route111_Movement_1F114A
+	applymovement 4, Route111_Movement_WinstrateEnterHouse
 	waitmovement 0
 	removeobject 4
-	call Route111_EventScript_1F1143
+	call Route111_EventScript_CloseWinstrateDoor
 	release
 	end
 
-Route111_EventScript_1F113C:: @ 81F113C
+Route111_EventScript_OpenWinstrateDoor:: @ 81F113C
 	opendoor 13, 113
 	waitdooranim
 	return
 
-Route111_EventScript_1F1143:: @ 81F1143
+Route111_EventScript_CloseWinstrateDoor:: @ 81F1143
 	closedoor 13, 113
 	waitdooranim
 	return
 
-Route111_Movement_1F114A: @ 81F114A
+Route111_Movement_WinstrateEnterHouse: @ 81F114A
 	walk_in_place_fastest_up
 	walk_up
 	step_end
 
-Route111_Movement_1F114D: @ 81F114D
+Route111_Movement_WinstrateExitHouse: @ 81F114D
 	walk_down
 	step_end
 
-Route111_Movement_1F114F: @ 81F114F
+Route111_Movement_WaitForNextWinstrate: @ 81F114F
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-Route111_EventScript_1F1153:: @ 81F1153
+Route111_EventScript_RouteSignMauville:: @ 81F1153
-	msgbox Route111_Text_1F18CE, MSGBOX_SIGN
+	msgbox Route111_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F115C:: @ 81F115C
+Route111_EventScript_WinstrateHouseSign:: @ 81F115C
-	msgbox Route111_Text_1F18E8, MSGBOX_SIGN
+	msgbox Route111_Text_WinstrateHouseSign, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1165:: @ 81F1165
+Route111_EventScript_RouteSign112:: @ 81F1165
-	msgbox Route111_Text_1F1921, MSGBOX_SIGN
+	msgbox Route111_Text_RouteSign112, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F116E:: @ 81F116E
+Route111_EventScript_RouteSign113:: @ 81F116E
-	msgbox Route111_Text_1F1937, MSGBOX_SIGN
+	msgbox Route111_Text_RouteSign113, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1177:: @ 81F1177
+Route111_EventScript_OldLadysRestStopSign:: @ 81F1177
-	msgbox Route111_Text_1F194D, MSGBOX_SIGN
+	msgbox Route111_Text_OldLadysRestStopSign, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1180:: @ 81F1180
+Route111_EventScript_TrainerTipsSpAtkSpDef:: @ 81F1180
-	msgbox Route111_Text_1F1987, MSGBOX_SIGN
+	msgbox Route111_Text_TrainerTipsSpAtkSpDef, MSGBOX_SIGN
 	end
 
-Route111_EventScript_1F1189:: @ 81F1189
+Route111_EventScript_Man1:: @ 81F1189
-	msgbox Route111_Text_1F17BA, MSGBOX_NPC
+	msgbox Route111_Text_ToughToKeepWinningUpTheRanks, MSGBOX_NPC
 	end
 
-Route111_EventScript_1F1192:: @ 81F1192
+Route111_EventScript_Man2:: @ 81F1192
-	msgbox Route111_Text_1F186E, MSGBOX_NPC
+	msgbox Route111_Text_WinstrateFamilyDestroyedMe, MSGBOX_NPC
 	end
 
-Route111_EventScript_1F119B:: @ 81F119B
+Route111_EventScript_Hiker:: @ 81F119B
 	lock
 	faceplayer
 	compare VAR_MIRAGE_TOWER_STATE, 3
-	goto_if_eq Route111_EventScript_1F11C6
+	goto_if_eq Route111_EventScript_HikerMirageTowerGone
 	compare VAR_MIRAGE_TOWER_STATE, 2
-	goto_if_eq Route111_EventScript_1F11D0
+	goto_if_eq Route111_EventScript_HikerMirageTowerDisintegrated
-	goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_1F11DA
+	goto_if_set FLAG_MIRAGE_TOWER_VISIBLE, Route111_EventScript_HikerMirageTowerVisible
-	msgbox Route111_Text_1F1A22, MSGBOX_DEFAULT
+	msgbox Route111_Text_ShouldBeMirageTowerAroundHere, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11C6:: @ 81F11C6
+Route111_EventScript_HikerMirageTowerGone:: @ 81F11C6
-	msgbox Route111_Text_1F1C12, MSGBOX_DEFAULT
+	msgbox Route111_Text_MirageTowerHasntBeenSeenSince, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11D0:: @ 81F11D0
+Route111_EventScript_HikerMirageTowerDisintegrated:: @ 81F11D0
-	msgbox Route111_Text_1F1B92, MSGBOX_DEFAULT
+	msgbox Route111_Text_ThatWasShockingSandRainedDown, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11DA:: @ 81F11DA
+Route111_EventScript_HikerMirageTowerVisible:: @ 81F11DA
-	msgbox Route111_Text_1F1AC7, MSGBOX_DEFAULT
+	msgbox Route111_Text_MirageTowerClearlyVisible, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F11E4:: @ 81F11E4
+Route111_EventScript_RockSmashTipFatMan:: @ 81F11E4
 	lockall
 	applymovement 46, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route111_Text_1F1CCA, MSGBOX_DEFAULT
+	msgbox Route111_Text_MauvilleUncleToldMeToTakeRockSmash, MSGBOX_DEFAULT
 	closemessage
 	applymovement 46, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-Route111_EventScript_1F1204:: @ 81F1204
+Route111_EventScript_Drew:: @ 81F1204
-	trainerbattle_single TRAINER_DREW, Route111_Text_29878E, Route111_Text_29880A
+	trainerbattle_single TRAINER_DREW, Route111_Text_DrewIntro, Route111_Text_DrewDefeat
-	msgbox Route111_Text_298853, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_DrewPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F121B:: @ 81F121B
+Route111_EventScript_Heidi:: @ 81F121B
-	trainerbattle_single TRAINER_HEIDI, Route111_Text_2988A3, Route111_Text_298908
+	trainerbattle_single TRAINER_HEIDI, Route111_Text_HeidiIntro, Route111_Text_HeidiDefeat
-	msgbox Route111_Text_29891B, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_HeidiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1232:: @ 81F1232
+Route111_EventScript_Beau:: @ 81F1232
-	trainerbattle_single TRAINER_BEAU, Route111_Text_29898E, Route111_Text_2989E6
+	trainerbattle_single TRAINER_BEAU, Route111_Text_BeauIntro, Route111_Text_BeauDefeat
-	msgbox Route111_Text_298A03, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_BeauPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1249:: @ 81F1249
+Route111_EventScript_Becky:: @ 81F1249
-	trainerbattle_single TRAINER_BECKY, Route111_Text_298A65, Route111_Text_298AAF
+	trainerbattle_single TRAINER_BECKY, Route111_Text_BeckyIntro, Route111_Text_BeckyDefeat
-	msgbox Route111_Text_298AC0, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_BeckyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1260:: @ 81F1260
+Route111_EventScript_Dusty:: @ 81F1260
-	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_298B08, Route111_Text_298B53, Route111_EventScript_1F128C
+	trainerbattle_single TRAINER_DUSTY_1, Route111_Text_DustyIntro, Route111_Text_DustyDefeat, Route111_EventScript_RegisterDusty
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route111_EventScript_1F12AB
+	goto_if_eq Route111_EventScript_RematchDusty
-	msgbox Route111_Text_298B9A, MSGBOX_DEFAULT
+	msgbox Route111_Text_DustyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F128C:: @ 81F128C
+Route111_EventScript_RegisterDusty:: @ 81F128C
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_298C00, MSGBOX_DEFAULT
+	msgbox Route111_Text_DustyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DUSTY_1
 	release
 	end
 
-Route111_EventScript_1F12AB:: @ 81F12AB
+Route111_EventScript_RematchDusty:: @ 81F12AB
-	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_298C5F, Route111_Text_298CD2
+	trainerbattle_rematch TRAINER_DUSTY_1, Route111_Text_DustyRematchIntro, Route111_Text_DustyRematchDefeat
-	msgbox Route111_Text_298D0C, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_DustyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12C2:: @ 81F12C2
+Route111_EventScript_Travis:: @ 81F12C2
-	trainerbattle_single TRAINER_TRAVIS, Route111_Text_298DA9, Route111_Text_298DD8
+	trainerbattle_single TRAINER_TRAVIS, Route111_Text_TravisIntro, Route111_Text_TravisDefeat
-	msgbox Route111_Text_298DF1, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_TravisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12D9:: @ 81F12D9
+Route111_EventScript_Irene:: @ 81F12D9
-	trainerbattle_single TRAINER_IRENE, Route111_Text_298E2F, Route111_Text_298E6E
+	trainerbattle_single TRAINER_IRENE, Route111_Text_IreneIntro, Route111_Text_IreneDefeat
-	msgbox Route111_Text_298E8C, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_IrenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F12F0:: @ 81F12F0
+Route111_EventScript_Daisuke:: @ 81F12F0
-	trainerbattle_single TRAINER_DAISUKE, Route111_Text_298EE6, Route111_Text_298F14
+	trainerbattle_single TRAINER_DAISUKE, Route111_Text_DaisukeIntro, Route111_Text_DaisukeDefeat
-	msgbox Route111_Text_298F26, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_DaisukePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1307:: @ 81F1307
+Route111_EventScript_Wilton:: @ 81F1307
-	trainerbattle_single TRAINER_WILTON_1, Route111_Text_298F79, Route111_Text_298FA9, Route111_EventScript_1F1333
+	trainerbattle_single TRAINER_WILTON_1, Route111_Text_WiltonIntro, Route111_Text_WiltonDefeat, Route111_EventScript_RegisterWilton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route111_EventScript_1F1352
+	goto_if_eq Route111_EventScript_RematchWilton
-	msgbox Route111_Text_298FD4, MSGBOX_DEFAULT
+	msgbox Route111_Text_WiltonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F1333:: @ 81F1333
+Route111_EventScript_RegisterWilton:: @ 81F1333
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_29903D, MSGBOX_DEFAULT
+	msgbox Route111_Text_WiltonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_WILTON_1
 	release
 	end
 
-Route111_EventScript_1F1352:: @ 81F1352
+Route111_EventScript_RematchWilton:: @ 81F1352
-	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_29909B, Route111_Text_2990EE
+	trainerbattle_rematch TRAINER_WILTON_1, Route111_Text_WiltonRematchIntro, Route111_Text_WiltonRematchDefeat
-	msgbox Route111_Text_299102, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_WiltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1369:: @ 81F1369
+Route111_EventScript_Brooke:: @ 81F1369
-	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_299143, Route111_Text_299193, Route111_EventScript_1F1395
+	trainerbattle_single TRAINER_BROOKE_1, Route111_Text_BrookeIntro, Route111_Text_BrookeDefeat, Route111_EventScript_RegisterBrooke
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route111_EventScript_1F13B4
+	goto_if_eq Route111_EventScript_RematchBrooke
-	msgbox Route111_Text_2991C2, MSGBOX_DEFAULT
+	msgbox Route111_Text_BrookePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_1F1395:: @ 81F1395
+Route111_EventScript_RegisterBrooke:: @ 81F1395
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route111_Text_29921D, MSGBOX_DEFAULT
+	msgbox Route111_Text_BrookeRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_BROOKE_1
 	release
 	end
 
-Route111_EventScript_1F13B4:: @ 81F13B4
+Route111_EventScript_RematchBrooke:: @ 81F13B4
-	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_29925D, Route111_Text_2992D6
+	trainerbattle_rematch TRAINER_BROOKE_1, Route111_Text_BrookeRematchIntro, Route111_Text_BrookeRematchDefeat
-	msgbox Route111_Text_2992F5, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_BrookePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13CB:: @ 81F13CB
+Route111_EventScript_Hayden:: @ 81F13CB
-	trainerbattle_single TRAINER_HAYDEN, Route111_Text_299682, Route111_Text_2996BE
+	trainerbattle_single TRAINER_HAYDEN, Route111_Text_HaydenIntro, Route111_Text_HaydenDefeat
-	msgbox Route111_Text_2996C5, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_HaydenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13E2:: @ 81F13E2
+Route111_EventScript_Bianca:: @ 81F13E2
-	trainerbattle_single TRAINER_BIANCA, Route111_Text_2996FE, Route111_Text_29973D
+	trainerbattle_single TRAINER_BIANCA, Route111_Text_BiancaIntro, Route111_Text_BiancaDefeat
-	msgbox Route111_Text_29975D, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_BiancaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F13F9:: @ 81F13F9
+Route111_EventScript_Tyron:: @ 81F13F9
-	trainerbattle_single TRAINER_TYRON, Route111_Text_299524, Route111_Text_299549
+	trainerbattle_single TRAINER_TYRON, Route111_Text_TyronIntro, Route111_Text_TyronDefeat
-	msgbox Route111_Text_299576, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_TyronPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1410:: @ 81F1410
+Route111_EventScript_Celina:: @ 81F1410
-	trainerbattle_single TRAINER_CELINA, Route111_Text_2995F0, Route111_Text_299625
+	trainerbattle_single TRAINER_CELINA, Route111_Text_CelinaIntro, Route111_Text_CelinaDefeat
-	msgbox Route111_Text_29964B, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_CelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1427:: @ 81F1427
+Route111_EventScript_Celia:: @ 81F1427
-	trainerbattle_single TRAINER_CELIA, Route111_Text_29934B, Route111_Text_299384
+	trainerbattle_single TRAINER_CELIA, Route111_Text_CeliaIntro, Route111_Text_CeliaDefeat
-	msgbox Route111_Text_2993A7, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_CeliaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F143E:: @ 81F143E
+Route111_EventScript_Bryan:: @ 81F143E
-	trainerbattle_single TRAINER_BRYAN, Route111_Text_299401, Route111_Text_299431
+	trainerbattle_single TRAINER_BRYAN, Route111_Text_BryanIntro, Route111_Text_BryanDefeat
-	msgbox Route111_Text_29945F, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_BryanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F1455:: @ 81F1455
+Route111_EventScript_Branden:: @ 81F1455
-	trainerbattle_single TRAINER_BRANDEN, Route111_Text_299493, Route111_Text_2994C5
+	trainerbattle_single TRAINER_BRANDEN, Route111_Text_BrandenIntro, Route111_Text_BrandenDefeat
-	msgbox Route111_Text_2994FB, MSGBOX_AUTOCLOSE
+	msgbox Route111_Text_BrandenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route111_EventScript_1F146C:: @ 81F146C
+Route111_EventScript_TrainerHillSign:: @ 81F146C
-	msgbox Route111_Text_1F1D61, MSGBOX_SIGN
+	msgbox Route111_Text_TrainerHillSign, MSGBOX_SIGN
 	end
 
-Route111_Text_1F1475: @ 81F1475
+Route111_Text_BattleOurFamily: @ 81F1475
 	.string "Hello! I take it you're a traveler.\p"
 	.string "How's this? What do you say to taking\n"
 	.string "on our family of four in a series of\l"
 	.string "POKéMON battles?$"
 
-Route111_Text_1F14F5: @ 81F14F5
+Route111_Text_IsThatSo: @ 81F14F5
 	.string "Is that so?\n"
 	.string "Drop in, if you change your mind!$"
 
-Route111_Text_1F1523: @ 81F1523
+Route111_Text_VictorIntro: @ 81F1523
 	.string "That's the spirit! I like you!$"
 
-Route111_Text_1F1542: @ 81F1542
+Route111_Text_VictorDefeat: @ 81F1542
 	.string "Aiyah!\n"
 	.string "You're a lot tougher than I expected!$"
 
-Route111_Text_1F156F: @ 81F156F
+Route111_Text_VictorPostBattle: @ 81F156F
 	.string "Hey, all!\n"
 	.string "I've found a pretty strong TRAINER!$"
 
-Route111_Text_1F159D: @ 81F159D
+Route111_Text_VictoriaIntro: @ 81F159D
 	.string "Oh, my goodness! Aren't you young?\p"
 	.string "You must be quite the TRAINER to beat\n"
 	.string "my husband, though.\p"
 	.string "It's my turn to battle now!$"
 
-Route111_Text_1F1616: @ 81F1616
+Route111_Text_VictoriaDefeat: @ 81F1616
 	.string "Oh, gosh!\n"
 	.string "I can't get over how strong you are!$"
 
-Route111_Text_1F1645: @ 81F1645
+Route111_Text_VictoriaPostBattle: @ 81F1645
 	.string "There's a strong TRAINER here!\n"
 	.string "This one's really strong!$"
 
-Route111_Text_1F167E: @ 81F167E
+Route111_Text_ViviIntro: @ 81F167E
 	.string "You're stronger than Mommy? Wow!\p"
 	.string "But I'm strong, too!\n"
 	.string "Really! Honestly!$"
 
-Route111_Text_1F16C6: @ 81F16C6
+Route111_Text_ViviDefeat: @ 81F16C6
 	.string "Huh? Did I just lose?$"
 
-Route111_Text_1F16DC: @ 81F16DC
+Route111_Text_ViviPostBattle: @ 81F16DC
 	.string "This stinks…\p"
 	.string "…Snivel… Grandma!$"
 
-Route111_Text_1F16FB: @ 81F16FB
+Route111_Text_VickyIntro: @ 81F16FB
 	.string "How dare you make my granddaughter\n"
 	.string "cry!\p"
 	.string "For that, I'm going to smack you!\n"
 	.string "Prepare to lose!$"
 
-Route111_Text_1F1756: @ 81F1756
+Route111_Text_VickyDefeat: @ 81F1756
 	.string "Kwah! You are strong…\n"
 	.string "My granddaughter was right…$"
 
-Route111_Text_1F1788: @ 81F1788
+Route111_Text_VickyPostBattle: @ 81F1788
 	.string "If you're not in any hurry,\n"
 	.string "visit with us awhile.$"
 
-Route111_Text_1F17BA: @ 81F17BA
+Route111_Text_ToughToKeepWinningUpTheRanks: @ 81F17BA
 	.string "If you don't raise your POKéMON some\n"
 	.string "more, it could be tough to keep winning\l"
 	.string "up through the ranks.\p"
@@ -655,32 +657,32 @@ Route111_Text_1F17BA: @ 81F17BA
 	.string "ELITE FOUR are far stronger than\l"
 	.string "any GYM LEADER.$"
 
-Route111_Text_1F186E: @ 81F186E
+Route111_Text_WinstrateFamilyDestroyedMe: @ 81F186E
 	.string "I challenged the WINSTRATE family,\n"
 	.string "but four matches in a row is tough\l"
 	.string "going… They destroyed me.$"
 
-Route111_Text_1F18CE: @ 81F18CE
+Route111_Text_RouteSignMauville: @ 81F18CE
 	.string "ROUTE 111\n"
 	.string "{DOWN_ARROW} MAUVILLE CITY$"
 
-Route111_Text_1F18E8: @ 81F18E8
+Route111_Text_WinstrateHouseSign: @ 81F18E8
 	.string "“Our family's hearts beat as one!”\n"
 	.string "THE WINSTRATE'S HOUSE$"
 
-Route111_Text_1F1921: @ 81F1921
+Route111_Text_RouteSign112: @ 81F1921
 	.string "ROUTE 111\n"
 	.string "{LEFT_ARROW} ROUTE 112$"
 
-Route111_Text_1F1937: @ 81F1937
+Route111_Text_RouteSign113: @ 81F1937
 	.string "ROUTE 111\n"
 	.string "{LEFT_ARROW} ROUTE 113$"
 
-Route111_Text_1F194D: @ 81F194D
+Route111_Text_OldLadysRestStopSign: @ 81F194D
 	.string "OLD LADY'S REST STOP\n"
 	.string "“Come in and rest your tired bones.”$"
 
-Route111_Text_1F1987: @ 81F1987
+Route111_Text_TrainerTipsSpAtkSpDef: @ 81F1987
 	.string "TRAINER TIPS\p"
 	.string "One of the indicators of a POKéMON's\n"
 	.string "powerfulness is SP. ATK. It stands for\l"
@@ -688,14 +690,14 @@ Route111_Text_1F1987: @ 81F1987
 	.string "Likewise, SP. DEF stands for “SPECIAL\n"
 	.string "DEFENSE.”$"
 
-Route111_Text_1F1A22: @ 81F1A22
+Route111_Text_ShouldBeMirageTowerAroundHere: @ 81F1A22
 	.string "There should be a tower made of sand\n"
 	.string "around here somewhere.\p"
 	.string "But for some reason, it can be seen\n"
 	.string "sometimes, and sometimes not.\p"
 	.string "That's why I call it the MIRAGE TOWER.$"
 
-Route111_Text_1F1AC7: @ 81F1AC7
+Route111_Text_MirageTowerClearlyVisible: @ 81F1AC7
 	.string "I see it!\n"
 	.string "The tower of sand!\p"
 	.string "The sand tower they called a mirage\n"
@@ -705,7 +707,7 @@ Route111_Text_1F1AC7: @ 81F1AC7
 	.string "I want to go inside it, but I can't\n"
 	.string "get my courage up for it…$"
 
-Route111_Text_1F1B92: @ 81F1B92
+Route111_Text_ThatWasShockingSandRainedDown: @ 81F1B92
 	.string "Whoa…\n"
 	.string "That was shocking.\p"
 	.string "Sand rained down in chunks all of\n"
@@ -713,21 +715,21 @@ Route111_Text_1F1B92: @ 81F1B92
 	.string "What was it like inside?\n"
 	.string "Were there sandy ghosts and such?$"
 
-Route111_Text_1F1C12: @ 81F1C12
+Route111_Text_MirageTowerHasntBeenSeenSince: @ 81F1C12
 	.string "Since I spoke to you, the tower of sand\n"
 	.string "hasn't been seen.\p"
 	.string "Perhaps it really was\n"
 	.string "the MIRAGE TOWER…$"
 
-Route111_Text_1F1C74: @ 81F1C74
+Route111_Text_ClawFossilDisappeared: @ 81F1C74
 	.string "The CLAW FOSSIL disappeared into\n"
 	.string "the sand…$"
 
-Route111_Text_1F1C9F: @ 81F1C9F
+Route111_Text_RootFossilDisappeared: @ 81F1C9F
 	.string "The ROOT FOSSIL disappeared into\n"
 	.string "the sand…$"
 
-Route111_Text_1F1CCA: @ 81F1CCA
+Route111_Text_MauvilleUncleToldMeToTakeRockSmash: @ 81F1CCA
 	.string "Oh, no!\p"
 	.string "My uncle in MAUVILLE told me to take\n"
 	.string "ROCK SMASH with me if I was going to\l"
@@ -735,7 +737,7 @@ Route111_Text_1F1CCA: @ 81F1CCA
 	.string "My uncle? He lives across from\n"
 	.string "the bike shop in MAUVILLE.$"
 
-Route111_Text_1F1D61: @ 81F1D61
+Route111_Text_TrainerHillSign: @ 81F1D61
 	.string "{RIGHT_ARROW} TRAINER HILL ENTRANCE\p"
 	.string "“Scale the heights, you hot-blooded\n"
 	.string "TRAINERS!”$"

data/maps/Route112/map.json

@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1DB7",
+      "script": "Route112_EventScript_MagmaGrunts",
       "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route112_EventScript_1F1E6A",
+      "script": "Route112_EventScript_Brice",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1EE3",
+      "script": "Route112_EventScript_Larry",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1EFA",
+      "script": "Route112_EventScript_Carol",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1E81",
+      "script": "Route112_EventScript_Trent",
       "flag": "0"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1DB7",
+      "script": "Route112_EventScript_MagmaGrunts",
       "flag": "FLAG_HIDE_ROUTE_112_TEAM_MAGMA"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route112_EventScript_1F1E61",
+      "script": "Route112_EventScript_Hiker",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1F11",
+      "script": "Route112_EventScript_Bryant",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route112_EventScript_1F1F28",
+      "script": "Route112_EventScript_Shayla",
       "flag": "0"
     }
   ],
@@ -265,7 +265,7 @@
       "y": 44,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E4F"
+      "script": "Route112_EventScript_MtChimneySign"
     },
     {
       "type": "sign",
@@ -273,7 +273,7 @@
       "y": 37,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E46"
+      "script": "Route112_EventScript_MtChimneyCableCarSign"
     },
     {
       "type": "sign",
@@ -281,7 +281,7 @@
       "y": 49,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route112_EventScript_1F1E58"
+      "script": "Route112_EventScript_RouteSignLavaridge"
     }
   ]
 }

data/maps/Route112/scripts.inc

@@ -7,13 +7,13 @@ Route112_OnTransition: @ 81F1DAE
 	setvar VAR_JAGGED_PASS_ASH_WEATHER, 0
 	end
 
-Route112_EventScript_1F1DB7:: @ 81F1DB7
+Route112_EventScript_MagmaGrunts:: @ 81F1DB7
 	lockall
 	delay 40
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1F3F, MSGBOX_DEFAULT
+	msgbox Route112_Text_LeaderGoingToAwakenThing, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -21,7 +21,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1F7A, MSGBOX_DEFAULT
+	msgbox Route112_Text_YeahWeNeedMeteorite, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -29,7 +29,7 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F1FBA, MSGBOX_DEFAULT
+	msgbox Route112_Text_OhThatsWhyCrewWentToFallarbor, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -37,107 +37,107 @@ Route112_EventScript_1F1DB7:: @ 81F1DB7
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 20
-	msgbox Route112_Text_1F2003, MSGBOX_DEFAULT
+	msgbox Route112_Text_CantLetAnyonePassUntilTheyreBack, MSGBOX_DEFAULT
 	closemessage
 	applymovement 6, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-Route112_EventScript_1F1E46:: @ 81F1E46
+Route112_EventScript_MtChimneyCableCarSign:: @ 81F1E46
-	msgbox Route112_Text_1F20C1, MSGBOX_SIGN
+	msgbox Route112_Text_MtChimneyCableCarSign, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E4F:: @ 81F1E4F
+Route112_EventScript_MtChimneySign:: @ 81F1E4F
-	msgbox Route112_Text_1F20ED, MSGBOX_SIGN
+	msgbox Route112_Text_MtChimneySign, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E58:: @ 81F1E58
+Route112_EventScript_RouteSignLavaridge:: @ 81F1E58
-	msgbox Route112_Text_1F2138, MSGBOX_SIGN
+	msgbox Route112_Text_RouteSignLavaridge, MSGBOX_SIGN
 	end
 
-Route112_EventScript_1F1E61:: @ 81F1E61
+Route112_EventScript_Hiker:: @ 81F1E61
-	msgbox Route112_Text_1F204E, MSGBOX_NPC
+	msgbox Route112_Text_NotEasyToGetBackToLavaridge, MSGBOX_NPC
 	end
 
-Route112_EventScript_1F1E6A:: @ 81F1E6A
+Route112_EventScript_Brice:: @ 81F1E6A
-	trainerbattle_single TRAINER_BRICE, Route112_Text_29978E, Route112_Text_2997CA
+	trainerbattle_single TRAINER_BRICE, Route112_Text_BriceIntro, Route112_Text_BriceDefeat
-	msgbox Route112_Text_2997DC, MSGBOX_AUTOCLOSE
+	msgbox Route112_Text_BricePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1E81:: @ 81F1E81
+Route112_EventScript_Trent:: @ 81F1E81
-	trainerbattle_single TRAINER_TRENT_1, Route112_Text_299815, Route112_Text_29987C, Route112_EventScript_1F1EAD
+	trainerbattle_single TRAINER_TRENT_1, Route112_Text_TrentIntro, Route112_Text_TrentDefeat, Route112_EventScript_RegisterTrent
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route112_EventScript_1F1ECC
+	goto_if_eq Route112_EventScript_RematchTrent
-	msgbox Route112_Text_299896, MSGBOX_DEFAULT
+	msgbox Route112_Text_TrentPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route112_EventScript_1F1EAD:: @ 81F1EAD
+Route112_EventScript_RegisterTrent:: @ 81F1EAD
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route112_Text_29993C, MSGBOX_DEFAULT
+	msgbox Route112_Text_TrentRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_TRENT_1
 	release
 	end
 
-Route112_EventScript_1F1ECC:: @ 81F1ECC
+Route112_EventScript_RematchTrent:: @ 81F1ECC
-	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_2999BD, Route112_Text_2999F7
+	trainerbattle_rematch TRAINER_TRENT_1, Route112_Text_TrentRematchIntro, Route112_Text_TrentRematchDefeat
-	msgbox Route112_Text_299A0F, MSGBOX_AUTOCLOSE
+	msgbox Route112_Text_TrentRematchPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1EE3:: @ 81F1EE3
+Route112_EventScript_Larry:: @ 81F1EE3
-	trainerbattle_single TRAINER_LARRY, Route112_Text_299A89, Route112_Text_299AAC
+	trainerbattle_single TRAINER_LARRY, Route112_Text_LarryIntro, Route112_Text_LarryDefeat
-	msgbox Route112_Text_299AB4, MSGBOX_AUTOCLOSE
+	msgbox Route112_Text_LarryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1EFA:: @ 81F1EFA
+Route112_EventScript_Carol:: @ 81F1EFA
-	trainerbattle_single TRAINER_CAROL, Route112_Text_299AE4, Route112_Text_299B36
+	trainerbattle_single TRAINER_CAROL, Route112_Text_CarolIntro, Route112_Text_CarolDefeat
-	msgbox Route112_Text_299B4C, MSGBOX_AUTOCLOSE
+	msgbox Route112_Text_CarolPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1F11:: @ 81F1F11
+Route112_EventScript_Bryant:: @ 81F1F11
-	trainerbattle_single TRAINER_BRYANT, Route112_Text_299BAE, Route112_Text_299BDF
+	trainerbattle_single TRAINER_BRYANT, Route112_Text_BryantIntro, Route112_Text_BryantDefeat
-	msgbox Route112_Text_299BFB, MSGBOX_AUTOCLOSE
+	msgbox Route112_Text_BryantPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_EventScript_1F1F28:: @ 81F1F28
+Route112_EventScript_Shayla:: @ 81F1F28
-	trainerbattle_single TRAINER_SHAYLA, Route112_Text_299C34, Route112_Text_299C8F
+	trainerbattle_single TRAINER_SHAYLA, Route112_Text_ShaylaIntro, Route112_Text_ShaylaDefeat
-	msgbox Route112_Text_299CC6, MSGBOX_AUTOCLOSE
+	msgbox Route112_Text_ShaylaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route112_Text_1F1F3F: @ 81F1F3F
+Route112_Text_LeaderGoingToAwakenThing: @ 81F1F3F
 	.string "Hey, man, is our leader really going\n"
 	.string "to awaken that thing?$"
 
-Route112_Text_1F1F7A: @ 81F1F7A
+Route112_Text_YeahWeNeedMeteorite: @ 81F1F7A
 	.string "Sounds like it, yeah. But I heard\n"
 	.string "we need a METEORITE to do it.$"
 
-Route112_Text_1F1FBA: @ 81F1FBA
+Route112_Text_OhThatsWhyCrewWentToFallarbor: @ 81F1FBA
 	.string "Oh, I get it now. That's why the rest\n"
 	.string "of the crew went out to FALLARBOR.$"
 
-Route112_Text_1F2003: @ 81F2003
+Route112_Text_CantLetAnyonePassUntilTheyreBack: @ 81F2003
 	.string "You got it. And until they come back,\n"
 	.string "we're not to let anyone pass, right.$"
 
-Route112_Text_1F204E: @ 81F204E
+Route112_Text_NotEasyToGetBackToLavaridge: @ 81F204E
 	.string "Eh, I'd like to get to MAUVILLE, but if\n"
 	.string "I went down these ledges, it'd be no\l"
 	.string "easy matter to get back to LAVARIDGE.$"
 
-Route112_Text_1F20C1: @ 81F20C1
+Route112_Text_MtChimneyCableCarSign: @ 81F20C1
 	.string "MT. CHIMNEY CABLE CAR\n"
 	.string "“A short walk {UP_ARROW} way!”$"
 
-Route112_Text_1F20ED: @ 81F20ED
+Route112_Text_MtChimneySign: @ 81F20ED
 	.string "MT. CHIMNEY\p"
 	.string "“For LAVARIDGE TOWN or the summit,\n"
 	.string "please take the CABLE CAR.”$"
 
-Route112_Text_1F2138: @ 81F2138
+Route112_Text_RouteSignLavaridge: @ 81F2138
 	.string "ROUTE 112\n"
 	.string "{LEFT_ARROW} LAVARIDGE TOWN$"
 

data/maps/Route113/map.json

@@ -40,7 +40,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_1F2193",
+      "script": "Route113_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route113_EventScript_1F218A",
+      "script": "Route113_EventScript_Gentleman",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route113_EventScript_1F21C0",
+      "script": "Route113_EventScript_Jaylen",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route113_EventScript_1F21D7",
+      "script": "Route113_EventScript_Dillon",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route113_EventScript_1F21EE",
+      "script": "Route113_EventScript_Madeline",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F2250",
+      "script": "Route113_EventScript_Lao",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "3",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22B2",
+      "script": "Route113_EventScript_Lung",
       "flag": "0"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22C9",
+      "script": "Route113_EventScript_Tori",
       "flag": "0"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F22E4",
+      "script": "Route113_EventScript_Tia",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route113_EventScript_1F2344",
+      "script": "Route113_EventScript_Wyatt",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route113_EventScript_1F232D",
+      "script": "Route113_EventScript_Lawrence",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route113_EventScript_1F22FF",
+      "script": "Route113_EventScript_Sophie",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route113_EventScript_1F2316",
+      "script": "Route113_EventScript_Coby",
       "flag": "0"
     }
   ],
@@ -404,7 +404,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F219C"
+      "script": "Route113_EventScript_RouteSign111"
     },
     {
       "type": "sign",
@@ -412,7 +412,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21A5"
+      "script": "Route113_EventScript_RouteSignFallarbor"
     },
     {
       "type": "sign",
@@ -420,7 +420,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21B7"
+      "script": "Route113_EventScript_TrainerTipsRegisterKeyItems"
     },
     {
       "type": "sign",
@@ -428,7 +428,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route113_EventScript_1F21AE"
+      "script": "Route113_EventScript_GlassWorkshopSign"
     },
     {
       "type": "secret_base",

data/maps/Route113/scripts.inc

@@ -1,170 +1,170 @@
 Route113_MapScripts:: @ 81F2153
-	map_script MAP_SCRIPT_ON_RESUME, Route113_MapScript1_1F215E
+	map_script MAP_SCRIPT_ON_RESUME, Route113_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route113_OnTransition
 	.byte 0
 
-Route113_MapScript1_1F215E: @ 81F215E
+Route113_OnResume: @ 81F215E
 	setstepcallback STEP_CB_ASH
 	end
 
 Route113_OnTransition: @ 81F2161
 	clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE
-	call Route113_EventScript_1F216A
+	call Route113_EventScript_CheckSetAshWeather
 	end
 
-Route113_EventScript_1F216A:: @ 81F216A
+Route113_EventScript_CheckSetAshWeather:: @ 81F216A
 	getplayerxy VAR_TEMP_0, VAR_TEMP_1
 	compare VAR_TEMP_0, 19
-	goto_if_lt Route113_EventScript_1F2189
+	goto_if_lt Route113_EventScript_DontSetAshWeather
 	compare VAR_TEMP_0, 84
-	goto_if_gt Route113_EventScript_1F2189
+	goto_if_gt Route113_EventScript_DontSetAshWeather
 	setweather WEATHER_ASH
 	return
 
-Route113_EventScript_1F2189:: @ 81F2189
+Route113_EventScript_DontSetAshWeather:: @ 81F2189
 	return
 
-Route113_EventScript_1F218A:: @ 81F218A
+Route113_EventScript_Gentleman:: @ 81F218A
-	msgbox Route113_Text_1F235B, MSGBOX_NPC
+	msgbox Route113_Text_AshCanBeFashionedIntoGlass, MSGBOX_NPC
 	end
 
-Route113_EventScript_1F2193:: @ 81F2193
+Route113_EventScript_NinjaBoy:: @ 81F2193
-	msgbox Route113_Text_1F23CA, MSGBOX_NPC
+	msgbox Route113_Text_FunWalkingThroughAsh, MSGBOX_NPC
 	end
 
-Route113_EventScript_1F219C:: @ 81F219C
+Route113_EventScript_RouteSign111:: @ 81F219C
-	msgbox Route113_Text_1F2440, MSGBOX_SIGN
+	msgbox Route113_Text_RouteSign111, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21A5:: @ 81F21A5
+Route113_EventScript_RouteSignFallarbor:: @ 81F21A5
-	msgbox Route113_Text_1F2456, MSGBOX_SIGN
+	msgbox Route113_Text_RouteSignFallarbor, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21AE:: @ 81F21AE
+Route113_EventScript_GlassWorkshopSign:: @ 81F21AE
-	msgbox Route113_Text_1F24F8, MSGBOX_SIGN
+	msgbox Route113_Text_GlassWorkshopSign, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21B7:: @ 81F21B7
+Route113_EventScript_TrainerTipsRegisterKeyItems:: @ 81F21B7
-	msgbox Route113_Text_1F2471, MSGBOX_SIGN
+	msgbox Route113_Text_TrainerTipsRegisterKeyItems, MSGBOX_SIGN
 	end
 
-Route113_EventScript_1F21C0:: @ 81F21C0
+Route113_EventScript_Jaylen:: @ 81F21C0
-	trainerbattle_single TRAINER_JAYLEN, Route113_Text_299D3C, Route113_Text_299D68
+	trainerbattle_single TRAINER_JAYLEN, Route113_Text_JaylenIntro, Route113_Text_JaylenDefeat
-	msgbox Route113_Text_299D7D, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_JaylenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F21D7:: @ 81F21D7
+Route113_EventScript_Dillon:: @ 81F21D7
-	trainerbattle_single TRAINER_DILLON, Route113_Text_299DE3, Route113_Text_299E1C
+	trainerbattle_single TRAINER_DILLON, Route113_Text_DillonIntro, Route113_Text_DillonDefeat
-	msgbox Route113_Text_299E38, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_DillonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F21EE:: @ 81F21EE
+Route113_EventScript_Madeline:: @ 81F21EE
-	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_299EA6, Route113_Text_299EF9, Route113_EventScript_1F221A
+	trainerbattle_single TRAINER_MADELINE_1, Route113_Text_MadelineIntro, Route113_Text_MadelineDefeat, Route113_EventScript_RegisterMadeline
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route113_EventScript_1F2239
+	goto_if_eq Route113_EventScript_RematchMadeline
-	msgbox Route113_Text_299F15, MSGBOX_DEFAULT
+	msgbox Route113_Text_MadelinePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_EventScript_1F221A:: @ 81F221A
+Route113_EventScript_RegisterMadeline:: @ 81F221A
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route113_Text_299F49, MSGBOX_DEFAULT
+	msgbox Route113_Text_MadelineRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_MADELINE_1
 	release
 	end
 
-Route113_EventScript_1F2239:: @ 81F2239
+Route113_EventScript_RematchMadeline:: @ 81F2239
-	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_299F8A, Route113_Text_299FC9
+	trainerbattle_rematch TRAINER_MADELINE_1, Route113_Text_MadelineRematchIntro, Route113_Text_MadelineRematchDefeat
-	msgbox Route113_Text_299FD8, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_MadelinePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2250:: @ 81F2250
+Route113_EventScript_Lao:: @ 81F2250
-	trainerbattle_single TRAINER_LAO_1, Route113_Text_29A015, Route113_Text_29A04C, Route113_EventScript_1F227C
+	trainerbattle_single TRAINER_LAO_1, Route113_Text_LaoIntro, Route113_Text_LaoDefeat, Route113_EventScript_RegisterLao
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route113_EventScript_1F229B
+	goto_if_eq Route113_EventScript_RematchLao
-	msgbox Route113_Text_29A067, MSGBOX_DEFAULT
+	msgbox Route113_Text_LaoPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route113_EventScript_1F227C:: @ 81F227C
+Route113_EventScript_RegisterLao:: @ 81F227C
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route113_Text_29A0A2, MSGBOX_DEFAULT
+	msgbox Route113_Text_LaoRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LAO_1
 	release
 	end
 
-Route113_EventScript_1F229B:: @ 81F229B
+Route113_EventScript_RematchLao:: @ 81F229B
-	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_29A0E8, Route113_Text_29A11F
+	trainerbattle_rematch TRAINER_LAO_1, Route113_Text_LaoRematchIntro, Route113_Text_LaoRematchDefeat
-	msgbox Route113_Text_29A13A, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_LaoPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22B2:: @ 81F22B2
+Route113_EventScript_Lung:: @ 81F22B2
-	trainerbattle_single TRAINER_LUNG, Route113_Text_29A192, Route113_Text_29A1C6
+	trainerbattle_single TRAINER_LUNG, Route113_Text_LungIntro, Route113_Text_LungDefeat
-	msgbox Route113_Text_29A219, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_LungPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22C9:: @ 81F22C9
+Route113_EventScript_Tori:: @ 81F22C9
-	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A261, Route113_Text_29A29D, Route113_Text_29A31F
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_ToriIntro, Route113_Text_ToriDefeat, Route113_Text_ToriNotEnoughMons
-	msgbox Route113_Text_29A2DE, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_ToriPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22E4:: @ 81F22E4
+Route113_EventScript_Tia:: @ 81F22E4
-	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_29A35C, Route113_Text_29A397, Route113_Text_29A419
+	trainerbattle_double TRAINER_TORI_AND_TIA, Route113_Text_TiaIntro, Route113_Text_TiaDefeat, Route113_Text_TiaNotEnoughMons
-	msgbox Route113_Text_29A3DA, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_TiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F22FF:: @ 81F22FF
+Route113_EventScript_Sophie:: @ 81F22FF
-	trainerbattle_single TRAINER_SOPHIE, Route113_Text_29A4BF, Route113_Text_29A508
+	trainerbattle_single TRAINER_SOPHIE, Route113_Text_SophieIntro, Route113_Text_SophieDefeat
-	msgbox Route113_Text_29A529, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_SophiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2316:: @ 81F2316
+Route113_EventScript_Coby:: @ 81F2316
-	trainerbattle_single TRAINER_COBY, Route113_Text_29A453, Route113_Text_29A480
+	trainerbattle_single TRAINER_COBY, Route113_Text_CobyIntro, Route113_Text_CobyDefeat
-	msgbox Route113_Text_29A489, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_CobyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F232D:: @ 81F232D
+Route113_EventScript_Lawrence:: @ 81F232D
-	trainerbattle_single TRAINER_LAWRENCE, Route113_Text_29A566, Route113_Text_29A5A0
+	trainerbattle_single TRAINER_LAWRENCE, Route113_Text_LawrenceIntro, Route113_Text_LawrenceDefeat
-	msgbox Route113_Text_29A5BE, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_LawrencePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_EventScript_1F2344:: @ 81F2344
+Route113_EventScript_Wyatt:: @ 81F2344
-	trainerbattle_single TRAINER_WYATT, Route113_Text_29A5E4, Route113_Text_29A628
+	trainerbattle_single TRAINER_WYATT, Route113_Text_WyattIntro, Route113_Text_WyattDefeat
-	msgbox Route113_Text_29A65D, MSGBOX_AUTOCLOSE
+	msgbox Route113_Text_WyattPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route113_Text_1F235B: @ 81F235B
+Route113_Text_AshCanBeFashionedIntoGlass: @ 81F235B
 	.string "Wahahaha! Today's technology is a\n"
 	.string "wondrous thing!\p"
 	.string "Take this volcanic ash here.\n"
 	.string "It can be fashioned into glass.$"
 
-Route113_Text_1F23CA: @ 81F23CA
+Route113_Text_FunWalkingThroughAsh: @ 81F23CA
 	.string "It's fun walking through the volcano's\n"
 	.string "ashes on the ground and grass.\p"
 	.string "You can see where you walked--it's\n"
 	.string "really neat!$"
 
-Route113_Text_1F2440: @ 81F2440
+Route113_Text_RouteSign111: @ 81F2440
 	.string "ROUTE 113\n"
 	.string "{RIGHT_ARROW} ROUTE 111$"
 
-Route113_Text_1F2456: @ 81F2456
+Route113_Text_RouteSignFallarbor: @ 81F2456
 	.string "ROUTE 113\n"
 	.string "{LEFT_ARROW} FALLARBOR TOWN$"
 
-Route113_Text_1F2471: @ 81F2471
+Route113_Text_TrainerTipsRegisterKeyItems: @ 81F2471
 	.string "TRAINER TIPS\p"
 	.string "You may register one of the KEY ITEMS\n"
 	.string "in your BAG as SELECT.\p"
 	.string "Simply press SELECT to use\n"
 	.string "the registered item conveniently.$"
 
-Route113_Text_1F24F8: @ 81F24F8
+Route113_Text_GlassWorkshopSign: @ 81F24F8
 	.string "GLASS WORKSHOP\n"
 	.string "“Turning Volcanic Ash into Glass Items”$"
 

data/maps/Route114/map.json

@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route114_EventScript_1F2640",
+      "script": "Route114_EventScript_Lenny",
       "flag": "0"
     },
     {
@@ -74,7 +74,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route114_EventScript_1F2657",
+      "script": "Route114_EventScript_Lucas",
       "flag": "0"
     },
     {
@@ -87,7 +87,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F266E",
+      "script": "Route114_EventScript_Shane",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F2685",
+      "script": "Route114_EventScript_Nancy",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F269C",
+      "script": "Route114_EventScript_Steve",
       "flag": "0"
     },
     {
@@ -178,7 +178,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F25D1",
+      "script": "Route114_EventScript_RoarGentleman",
       "flag": "0"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2612",
+      "script": "Route114_EventScript_Poochyena",
       "flag": "0"
     },
     {
@@ -204,7 +204,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2582",
+      "script": "Route114_EventScript_Man",
       "flag": "0"
     },
     {
@@ -217,7 +217,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2777",
+      "script": "Route114_EventScript_Nolan",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route114_EventScript_1F2760",
+      "script": "Route114_EventScript_Claude",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F26FE",
+      "script": "Route114_EventScript_Bernie",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route114_EventScript_1F27A9",
+      "script": "Route114_EventScript_Ivy",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route114_EventScript_1F278E",
+      "script": "Route114_EventScript_Tyra",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F27DB",
+      "script": "Route114_EventScript_Charlotte",
       "flag": "0"
     },
     {
@@ -347,7 +347,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route114_EventScript_1F27C4",
+      "script": "Route114_EventScript_Angelina",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route114_EventScript_1F27F2",
+      "script": "Route114_EventScript_Kai",
       "flag": "0"
     }
   ],
@@ -422,7 +422,7 @@
       "y": 64,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F2625"
+      "script": "Route114_EventScript_MeteorFallsSign"
     },
     {
       "type": "sign",
@@ -430,7 +430,7 @@
       "y": 7,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F262E"
+      "script": "Route114_EventScript_FossilManiacsHouseSign"
     },
     {
       "type": "secret_base",
@@ -480,7 +480,7 @@
       "y": 38,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route114_EventScript_1F2637"
+      "script": "Route114_EventScript_LanettesHouseSign"
     },
     {
       "type": "hidden_item",

data/maps/Route114/scripts.inc

@@ -1,7 +1,7 @@
 Route114_MapScripts:: @ 81F252F
 	map_script MAP_SCRIPT_ON_TRANSITION, Route114_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route114_MapScript1_1F2561
+	map_script MAP_SCRIPT_ON_LOAD, Route114_OnLoad
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_MapScript2_1F2578
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route114_OnFrame
 	.byte 0
 
 Route114_OnTransition: @ 81F253F
@@ -13,199 +13,199 @@ Route114_OnTransition: @ 81F253F
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route114_MapScript1_1F2561: @ 81F2561
+Route114_OnLoad: @ 81F2561
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_114_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute114South
 	end
 
-Route114_MapScript2_1F2578: @ 81F2578
+Route114_OnFrame: @ 81F2578
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route114_EventScript_1F2582:: @ 81F2582
+Route114_EventScript_Man:: @ 81F2582
 	lock
 	faceplayer
 	dotimebasedevents
-	goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_1F25C7
+	goto_if_set FLAG_DAILY_ROUTE_114_RECEIVED_BERRY, Route114_EventScript_ReceivedBerry
-	msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT
+	msgbox Route114_Text_LoveUsingBerryCrushShareBerry, MSGBOX_DEFAULT
-	random 5
+	random NUM_ROUTE_114_MAN_BERRIES
-	addvar VAR_RESULT, 15
+	addvar VAR_RESULT, NUM_ROUTE_114_MAN_BERRIES_SKIPPED
 	addvar VAR_RESULT, FIRST_BERRY_INDEX
 	giveitem_std VAR_RESULT
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_DAILY_ROUTE_114_RECEIVED_BERRY
-	msgbox Route114_Text_2A7034, MSGBOX_DEFAULT
+	msgbox Route114_Text_TryBerryCrushWithFriends, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F25C7:: @ 81F25C7
+Route114_EventScript_ReceivedBerry:: @ 81F25C7
-	msgbox Route114_Text_2A706E, MSGBOX_DEFAULT
+	msgbox Route114_Text_FunToThinkAboutBerries, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F25D1:: @ 81F25D1
+Route114_EventScript_RoarGentleman:: @ 81F25D1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1F2608
+	goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_ReceivedRoar
-	msgbox Route114_Text_1F2809, MSGBOX_DEFAULT
+	msgbox Route114_Text_AllMyMonDoesIsRoarTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM05
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM05
-	msgbox Route114_Text_1F2872, MSGBOX_DEFAULT
+	msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F2608:: @ 81F2608
+Route114_EventScript_ReceivedRoar:: @ 81F2608
-	msgbox Route114_Text_1F2872, MSGBOX_DEFAULT
+	msgbox Route114_Text_ExplainRoar, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F2612:: @ 81F2612
+Route114_EventScript_Poochyena:: @ 81F2612
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_POOCHYENA, 2
-	msgbox Route114_Text_1F28A6, MSGBOX_DEFAULT
+	msgbox Route114_Text_Poochyena, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-Route114_EventScript_1F2625:: @ 81F2625
+Route114_EventScript_MeteorFallsSign:: @ 81F2625
-	msgbox Route114_Text_1F28B3, MSGBOX_SIGN
+	msgbox Route114_Text_MeteorFallsSign, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F262E:: @ 81F262E
+Route114_EventScript_FossilManiacsHouseSign:: @ 81F262E
-	msgbox Route114_Text_1F28DB, MSGBOX_SIGN
+	msgbox Route114_Text_FossilManiacsHouseSign, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F2637:: @ 81F2637
+Route114_EventScript_LanettesHouseSign:: @ 81F2637
-	msgbox Route114_Text_1F2910, MSGBOX_SIGN
+	msgbox Route114_Text_LanettesHouse, MSGBOX_SIGN
 	end
 
-Route114_EventScript_1F2640:: @ 81F2640
+Route114_EventScript_Lenny:: @ 81F2640
-	trainerbattle_single TRAINER_LENNY, Route114_Text_29A6B1, Route114_Text_29A707
+	trainerbattle_single TRAINER_LENNY, Route114_Text_LennyIntro, Route114_Text_LennyDefeat
-	msgbox Route114_Text_29A715, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_LennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2657:: @ 81F2657
+Route114_EventScript_Lucas:: @ 81F2657
-	trainerbattle_single TRAINER_LUCAS_1, Route114_Text_29A777, Route114_Text_29A7B5
+	trainerbattle_single TRAINER_LUCAS_1, Route114_Text_LucasIntro, Route114_Text_LucasDefeat
-	msgbox Route114_Text_29A7D4, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_LucasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F266E:: @ 81F266E
+Route114_EventScript_Shane:: @ 81F266E
-	trainerbattle_single TRAINER_SHANE, Route114_Text_29A818, Route114_Text_29A88F
+	trainerbattle_single TRAINER_SHANE, Route114_Text_ShaneIntro, Route114_Text_ShaneDefeat
-	msgbox Route114_Text_29A89F, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_ShanePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2685:: @ 81F2685
+Route114_EventScript_Nancy:: @ 81F2685
-	trainerbattle_single TRAINER_NANCY, Route114_Text_29A8D9, Route114_Text_29A90E
+	trainerbattle_single TRAINER_NANCY, Route114_Text_NancyIntro, Route114_Text_NancyDefeat
-	msgbox Route114_Text_29A916, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_NancyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F269C:: @ 81F269C
+Route114_EventScript_Steve:: @ 81F269C
-	trainerbattle_single TRAINER_STEVE_1, Route114_Text_29A943, Route114_Text_29A973, Route114_EventScript_1F26C8
+	trainerbattle_single TRAINER_STEVE_1, Route114_Text_SteveIntro, Route114_Text_SteveDefeat, Route114_EventScript_RegisterSteve
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route114_EventScript_1F26E7
+	goto_if_eq Route114_EventScript_RematchSteve
-	msgbox Route114_Text_29A981, MSGBOX_DEFAULT
+	msgbox Route114_Text_StevePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F26C8:: @ 81F26C8
+Route114_EventScript_RegisterSteve:: @ 81F26C8
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route114_Text_29A9F7, MSGBOX_DEFAULT
+	msgbox Route114_Text_SteveRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_STEVE_1
 	release
 	end
 
-Route114_EventScript_1F26E7:: @ 81F26E7
+Route114_EventScript_RematchSteve:: @ 81F26E7
-	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_29AA3E, Route114_Text_29AA67
+	trainerbattle_rematch TRAINER_STEVE_1, Route114_Text_SteveRematchIntro, Route114_Text_SteveRematchDefeat
-	msgbox Route114_Text_29AA94, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_StevePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F26FE:: @ 81F26FE
+Route114_EventScript_Bernie:: @ 81F26FE
-	trainerbattle_single TRAINER_BERNIE_1, Route114_Text_29AADB, Route114_Text_29AB1A, Route114_EventScript_1F272A
+	trainerbattle_single TRAINER_BERNIE_1, Route114_Text_BernieIntro, Route114_Text_BernieDefeat, Route114_EventScript_RegisterBernie
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route114_EventScript_1F2749
+	goto_if_eq Route114_EventScript_RematchBernie
-	msgbox Route114_Text_29AB36, MSGBOX_DEFAULT
+	msgbox Route114_Text_BerniePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route114_EventScript_1F272A:: @ 81F272A
+Route114_EventScript_RegisterBernie:: @ 81F272A
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route114_Text_29ABA6, MSGBOX_DEFAULT
+	msgbox Route114_Text_BernieRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_BERNIE_1
 	release
 	end
 
-Route114_EventScript_1F2749:: @ 81F2749
+Route114_EventScript_RematchBernie:: @ 81F2749
-	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_29ABDC, Route114_Text_29AC10
+	trainerbattle_rematch TRAINER_BERNIE_1, Route114_Text_BernieRematchIntro, Route114_Text_BernieRematchDefeat
-	msgbox Route114_Text_29AC43, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_BerniePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2760:: @ 81F2760
+Route114_EventScript_Claude:: @ 81F2760
-	trainerbattle_single TRAINER_CLAUDE, Route114_Text_29ACB3, Route114_Text_29AD0A
+	trainerbattle_single TRAINER_CLAUDE, Route114_Text_ClaudeIntro, Route114_Text_ClaudeDefeat
-	msgbox Route114_Text_29AD2E, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_ClaudePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F2777:: @ 81F2777
+Route114_EventScript_Nolan:: @ 81F2777
-	trainerbattle_single TRAINER_NOLAN, Route114_Text_29ADA1, Route114_Text_29AE05
+	trainerbattle_single TRAINER_NOLAN, Route114_Text_NolanIntro, Route114_Text_NolanDefeat
-	msgbox Route114_Text_29AE3D, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_NolanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F278E:: @ 81F278E
+Route114_EventScript_Tyra:: @ 81F278E
-	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AE96, Route114_Text_29AEE7, Route114_Text_29AF3D
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_TyraIntro, Route114_Text_TyraDefeat, Route114_Text_TyraNotEnoughMons
-	msgbox Route114_Text_29AF0B, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_TyraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27A9:: @ 81F27A9
+Route114_EventScript_Ivy:: @ 81F27A9
-	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_29AF89, Route114_Text_29AFAC, Route114_Text_29B01B
+	trainerbattle_double TRAINER_TYRA_AND_IVY, Route114_Text_IvyIntro, Route114_Text_IvyDefeat, Route114_Text_IvyNotEnoughMons
-	msgbox Route114_Text_29AFCF, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_IvyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27C4:: @ 81F27C4
+Route114_EventScript_Angelina:: @ 81F27C4
-	trainerbattle_single TRAINER_ANGELINA, Route114_Text_29B16F, Route114_Text_29B19C
+	trainerbattle_single TRAINER_ANGELINA, Route114_Text_AngelinaIntro, Route114_Text_AngelinaDefeat
-	msgbox Route114_Text_29B1BC, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_AngelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27DB:: @ 81F27DB
+Route114_EventScript_Charlotte:: @ 81F27DB
-	trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_29B0DB, Route114_Text_29B0FB
+	trainerbattle_single TRAINER_CHARLOTTE, Route114_Text_CharlotteIntro, Route114_Text_CharlotteDefeat
-	msgbox Route114_Text_29B11A, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_CharlottePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_EventScript_1F27F2:: @ 81F27F2
+Route114_EventScript_Kai:: @ 81F27F2
-	trainerbattle_single TRAINER_KAI, Route114_Text_29B05D, Route114_Text_29B089
+	trainerbattle_single TRAINER_KAI, Route114_Text_KaiIntro, Route114_Text_KaiDefeat
-	msgbox Route114_Text_29B0B5, MSGBOX_AUTOCLOSE
+	msgbox Route114_Text_KaiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route114_Text_1F2809: @ 81F2809
+Route114_Text_AllMyMonDoesIsRoarTakeThis: @ 81F2809
 	.string "All my POKéMON does is ROAR…\n"
 	.string "No one dares to come near me…\p"
 	.string "Sigh… If you would, please take\n"
 	.string "this TM away…$"
 
-Route114_Text_1F2872: @ 81F2872
+Route114_Text_ExplainRoar: @ 81F2872
 	.string "TM05 contains ROAR.\n"
 	.string "A ROAR sends POKéMON scurrying.$"
 
-Route114_Text_1F28A6: @ 81F28A6
+Route114_Text_Poochyena: @ 81F28A6
 	.string "Bow! Bowwow!$"
 
-Route114_Text_1F28B3: @ 81F28B3
+Route114_Text_MeteorFallsSign: @ 81F28B3
 	.string "METEOR FALLS\n"
 	.string "RUSTBORO CITY THROUGH HERE$"
 
-Route114_Text_1F28DB: @ 81F28DB
+Route114_Text_FossilManiacsHouseSign: @ 81F28DB
 	.string "FOSSIL MANIAC'S HOUSE\n"
 	.string "“Fossils gratefully accepted!”$"
 
-Route114_Text_1F2910: @ 81F2910
+Route114_Text_LanettesHouse: @ 81F2910
 	.string "LANETTE'S HOUSE$"
 

data/maps/Route115/map.json

@@ -35,7 +35,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route115_EventScript_1F2973",
+      "script": "Route115_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route115_EventScript_1F298E",
+      "script": "Route115_EventScript_Timothy",
       "flag": "0"
     },
     {
@@ -61,7 +61,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2A07",
+      "script": "Route115_EventScript_Nob",
       "flag": "0"
     },
     {
@@ -113,7 +113,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route115_EventScript_1F2A69",
+      "script": "Route115_EventScript_Cyndy",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route115_EventScript_1F29F0",
+      "script": "Route115_EventScript_Koichi",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2ACB",
+      "script": "Route115_EventScript_Hector",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 3,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route115_EventScript_1F2AE2",
+      "script": "Route115_EventScript_Kyra",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route115_EventScript_1F2AF9",
+      "script": "Route115_EventScript_Jaiden",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B27",
+      "script": "Route115_EventScript_Helene",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B10",
+      "script": "Route115_EventScript_Alix",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route115_EventScript_1F2B3E",
+      "script": "Route115_EventScript_Marlene",
       "flag": "0"
     },
     {
@@ -370,7 +370,7 @@
       "y": 64,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route115_EventScript_1F297C"
+      "script": "Route115_EventScript_RouteSignRustboro"
     },
     {
       "type": "sign",
@@ -378,7 +378,7 @@
       "y": 38,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route115_EventScript_1F2985"
+      "script": "Route115_EventScript_MeteorFallsSign"
     },
     {
       "type": "secret_base",

data/maps/Route115/scripts.inc

@@ -1,10 +1,10 @@
 Route115_MapScripts:: @ 81F2920
-	map_script MAP_SCRIPT_ON_LOAD, Route115_MapScript1_1F2930
+	map_script MAP_SCRIPT_ON_LOAD, Route115_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, Route115_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_MapScript2_1F2969
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route115_OnFrame
 	.byte 0
 
-Route115_MapScript1_1F2930: @ 81F2930
+Route115_OnLoad: @ 81F2930
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute115West
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_115_EAST
@@ -20,134 +20,134 @@ Route115_OnTransition: @ 81F2947
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route115_MapScript2_1F2969: @ 81F2969
+Route115_OnFrame: @ 81F2969
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route115_EventScript_1F2973:: @ 81F2973
+Route115_EventScript_Woman:: @ 81F2973
-	msgbox Route115_Text_1F2B55, MSGBOX_NPC
+	msgbox Route115_Text_NeverKnowWhenCavePokemonWillAppear, MSGBOX_NPC
 	end
 
-Route115_EventScript_1F297C:: @ 81F297C
+Route115_EventScript_RouteSignRustboro:: @ 81F297C
-	msgbox Route115_Text_1F2BC9, MSGBOX_SIGN
+	msgbox Route115_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route115_EventScript_1F2985:: @ 81F2985
+Route115_EventScript_MeteorFallsSign:: @ 81F2985
-	msgbox Route115_Text_1F2BE3, MSGBOX_SIGN
+	msgbox Route115_Text_MeteorFallsSign, MSGBOX_SIGN
 	end
 
-Route115_EventScript_1F298E:: @ 81F298E
+Route115_EventScript_Timothy:: @ 81F298E
-	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_29B1FA, Route115_Text_29B230, Route115_EventScript_1F29BA
+	trainerbattle_single TRAINER_TIMOTHY_1, Route115_Text_TimothyIntro, Route115_Text_TimothyDefeat, Route115_EventScript_RegisterTimothy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route115_EventScript_1F29D9
+	goto_if_eq Route115_EventScript_RematchTimothy
-	msgbox Route115_Text_29B258, MSGBOX_DEFAULT
+	msgbox Route115_Text_TimothyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F29BA:: @ 81F29BA
+Route115_EventScript_RegisterTimothy:: @ 81F29BA
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B2B3, MSGBOX_DEFAULT
+	msgbox Route115_Text_TimothyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_TIMOTHY_1
 	release
 	end
 
-Route115_EventScript_1F29D9:: @ 81F29D9
+Route115_EventScript_RematchTimothy:: @ 81F29D9
-	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_29B32C, Route115_Text_29B372
+	trainerbattle_rematch TRAINER_TIMOTHY_1, Route115_Text_TimothyRematchIntro, Route115_Text_TimothyRematchDefeat
-	msgbox Route115_Text_29B385, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_TimothyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F29F0:: @ 81F29F0
+Route115_EventScript_Koichi:: @ 81F29F0
-	trainerbattle_single TRAINER_KOICHI, Route115_Text_29B3CC, Route115_Text_29B3ED
+	trainerbattle_single TRAINER_KOICHI, Route115_Text_KoichiIntro, Route115_Text_KoichiDefeat
-	msgbox Route115_Text_29B3FF, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_KoichiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2A07:: @ 81F2A07
+Route115_EventScript_Nob:: @ 81F2A07
-	trainerbattle_single TRAINER_NOB_1, Route115_Text_29B449, Route115_Text_29B480, Route115_EventScript_1F2A33
+	trainerbattle_single TRAINER_NOB_1, Route115_Text_NobIntro, Route115_Text_NobDefeat, Route115_EventScript_RegisterNob
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route115_EventScript_1F2A52
+	goto_if_eq Route115_EventScript_RematchNob
-	msgbox Route115_Text_29B49D, MSGBOX_DEFAULT
+	msgbox Route115_Text_NobPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F2A33:: @ 81F2A33
+Route115_EventScript_RegisterNob:: @ 81F2A33
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B50B, MSGBOX_DEFAULT
+	msgbox Route115_Text_NobRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_NOB_1
 	release
 	end
 
-Route115_EventScript_1F2A52:: @ 81F2A52
+Route115_EventScript_RematchNob:: @ 81F2A52
-	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_29B547, Route115_Text_29B59D
+	trainerbattle_rematch TRAINER_NOB_1, Route115_Text_NobRematchIntro, Route115_Text_NobRematchDefeat
-	msgbox Route115_Text_29B5B5, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_NobPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2A69:: @ 81F2A69
+Route115_EventScript_Cyndy:: @ 81F2A69
-	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_29B5EF, Route115_Text_29B62D, Route115_EventScript_1F2A95
+	trainerbattle_single TRAINER_CYNDY_1, Route115_Text_CyndyIntro, Route115_Text_CyndyDefeat, Route115_EventScript_RegisterCyndy
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route115_EventScript_1F2AB4
+	goto_if_eq Route115_EventScript_RematchCyndy
-	msgbox Route115_Text_29B647, MSGBOX_DEFAULT
+	msgbox Route115_Text_CyndyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route115_EventScript_1F2A95:: @ 81F2A95
+Route115_EventScript_RegisterCyndy:: @ 81F2A95
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route115_Text_29B6AB, MSGBOX_DEFAULT
+	msgbox Route115_Text_CyndyRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_CYNDY_1
 	release
 	end
 
-Route115_EventScript_1F2AB4:: @ 81F2AB4
+Route115_EventScript_RematchCyndy:: @ 81F2AB4
-	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_29B6FA, Route115_Text_29B71A
+	trainerbattle_rematch TRAINER_CYNDY_1, Route115_Text_CyndyRematchIntro, Route115_Text_CyndyRematchDefeat
-	msgbox Route115_Text_29B737, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_CyndyPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2ACB:: @ 81F2ACB
+Route115_EventScript_Hector:: @ 81F2ACB
-	trainerbattle_single TRAINER_HECTOR, Route115_Text_29B78F, Route115_Text_29B7C5
+	trainerbattle_single TRAINER_HECTOR, Route115_Text_HectorIntro, Route115_Text_HectorDefeat
-	msgbox Route115_Text_29B7EA, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_HectorPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2AE2:: @ 81F2AE2
+Route115_EventScript_Kyra:: @ 81F2AE2
-	trainerbattle_single TRAINER_KYRA, Route115_Text_29B826, Route115_Text_29B85D
+	trainerbattle_single TRAINER_KYRA, Route115_Text_KyraIntro, Route115_Text_KyraDefeat
-	msgbox Route115_Text_29B869, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_KyraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2AF9:: @ 81F2AF9
+Route115_EventScript_Jaiden:: @ 81F2AF9
-	trainerbattle_single TRAINER_JAIDEN, Route115_Text_29B8C1, Route115_Text_29B8E8
+	trainerbattle_single TRAINER_JAIDEN, Route115_Text_JaidenIntro, Route115_Text_JaidenDefeat
-	msgbox Route115_Text_29B904, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_JaidenPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B10:: @ 81F2B10
+Route115_EventScript_Alix:: @ 81F2B10
-	trainerbattle_single TRAINER_ALIX, Route115_Text_29B9CB, Route115_Text_29B9F6
+	trainerbattle_single TRAINER_ALIX, Route115_Text_AlixIntro, Route115_Text_AlixDefeat
-	msgbox Route115_Text_29BA04, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_AlixPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B27:: @ 81F2B27
+Route115_EventScript_Helene:: @ 81F2B27
-	trainerbattle_single TRAINER_HELENE, Route115_Text_29B92D, Route115_Text_29B958
+	trainerbattle_single TRAINER_HELENE, Route115_Text_HeleneIntro, Route115_Text_HeleneDefeat
-	msgbox Route115_Text_29B971, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_HelenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_EventScript_1F2B3E:: @ 81F2B3E
+Route115_EventScript_Marlene:: @ 81F2B3E
-	trainerbattle_single TRAINER_MARLENE, Route115_Text_29BA2C, Route115_Text_29BA67
+	trainerbattle_single TRAINER_MARLENE, Route115_Text_MarleneIntro, Route115_Text_MarleneDefeat
-	msgbox Route115_Text_29BA87, MSGBOX_AUTOCLOSE
+	msgbox Route115_Text_MarlenePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route115_Text_1F2B55: @ 81F2B55
+Route115_Text_NeverKnowWhenCavePokemonWillAppear: @ 81F2B55
 	.string "Exploring a cave isn't like walking\n"
 	.string "on a road.\p"
 	.string "You never know when wild POKéMON will\n"
 	.string "appear. It's full of suspense.$"
 
-Route115_Text_1F2BC9: @ 81F2BC9
+Route115_Text_RouteSignRustboro: @ 81F2BC9
 	.string "ROUTE 115\n"
 	.string "{DOWN_ARROW} RUSTBORO CITY$"
 
-Route115_Text_1F2BE3: @ 81F2BE3
+Route115_Text_MeteorFallsSign: @ 81F2BE3
 	.string "METEOR FALLS\n"
 	.string "FALLARBOR TOWN THROUGH HERE$"
 

data/maps/Route116/map.json

@@ -61,7 +61,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2E89",
+      "script": "Route116_EventScript_Joey",
       "flag": "0"
     },
     {
@@ -100,7 +100,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F2EA0",
+      "script": "Route116_EventScript_Jose",
       "flag": "0"
     },
     {
@@ -165,7 +165,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2D84",
+      "script": "Route116_EventScript_Briney",
       "flag": "FLAG_HIDE_ROUTE_116_MR_BRINEY"
     },
     {
@@ -191,7 +191,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2F65",
+      "script": "Route116_EventScript_Clark",
       "flag": "0"
     },
     {
@@ -230,7 +230,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F2F7C",
+      "script": "Route116_EventScript_Janice",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route116_EventScript_1F2F93",
+      "script": "Route116_EventScript_Karen",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route116_EventScript_1F2EB7",
+      "script": "Route116_EventScript_Jerry",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2CA2",
+      "script": "Route116_EventScript_DevonEmployee",
       "flag": "FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE"
     },
     {
@@ -295,8 +295,8 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2C70",
+      "script": "Route116_EventScript_WandasBoyfriend",
-      "flag": "FLAG_HIDE_ROUTE_116_TUNNELER"
+      "flag": "FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND"
     },
     {
       "graphics_id": "EVENT_OBJ_GFX_MANIAC",
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route116_EventScript_1F2DB6",
+      "script": "Route116_EventScript_GlassesMan",
       "flag": "FLAG_HIDE_ROUTE_116_DROPPED_GLASSES_MAN"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route116_EventScript_1F3041",
+      "script": "Route116_EventScript_Sarah",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route116_EventScript_1F3058",
+      "script": "Route116_EventScript_Dawson",
       "flag": "0"
     },
     {
@@ -373,7 +373,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route116_EventScript_1F3086",
+      "script": "Route116_EventScript_Johnson",
       "flag": "0"
     },
     {
@@ -386,7 +386,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route116_EventScript_1F306F",
+      "script": "Route116_EventScript_Devan",
       "flag": "0"
     }
   ],
@@ -435,7 +435,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE116_STATE",
       "var_value": "1",
-      "script": "Route116_EventScript_1F2D95"
+      "script": "Route116_EventScript_BrineyTrigger"
     }
   ],
   "bg_events": [
@@ -445,7 +445,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D57"
+      "script": "Route116_EventScript_RouteSignRustboro"
     },
     {
       "type": "sign",
@@ -453,7 +453,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D60"
+      "script": "Route116_EventScript_RusturfTunnelSign"
     },
     {
       "type": "sign",
@@ -461,7 +461,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D69"
+      "script": "Route116_EventScript_TunnelersRestHouseSign"
     },
     {
       "type": "secret_base",
@@ -483,7 +483,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D72"
+      "script": "Route116_EventScript_TrainerTipsBToStopEvolution"
     },
     {
       "type": "sign",
@@ -491,7 +491,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route116_EventScript_1F2D7B"
+      "script": "Route116_EventScript_TrainerTipsBagHasPockets"
     },
     {
       "type": "secret_base",

data/maps/Route116/scripts.inc

@@ -1,11 +1,11 @@
 Route116_MapScripts:: @ 81F2C0C
 	map_script MAP_SCRIPT_ON_TRANSITION, Route116_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route116_MapScript1_1F2C4F
+	map_script MAP_SCRIPT_ON_LOAD, Route116_OnLoad
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_MapScript2_1F2C66
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route116_OnFrame
 	.byte 0
 
 Route116_OnTransition: @ 81F2C1C
-	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47
+	call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_SetWandasBoyfriendPos
 	compare VAR_SHOULD_END_UNUSUAL_WEATHER, 1
 	call_if_eq UnusualWeather_EventScript_HideMapNamePopup
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
@@ -14,90 +14,90 @@ Route116_OnTransition: @ 81F2C1C
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route116_EventScript_1F2C47:: @ 81F2C47
+Route116_EventScript_SetWandasBoyfriendPos:: @ 81F2C47
 	setobjectxyperm 21, 38, 10
 	return
 
-Route116_MapScript1_1F2C4F: @ 81F2C4F
+Route116_OnLoad: @ 81F2C4F
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_NORTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116North
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_116_SOUTH
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute116South
 	end
 
-Route116_MapScript2_1F2C66: @ 81F2C66
+Route116_OnFrame: @ 81F2C66
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route116_EventScript_1F2C70:: @ 81F2C70
+Route116_EventScript_WandasBoyfriend:: @ 81F2C70
 	lock
 	faceplayer
-	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C8E
+	goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_BoyfriendGruntLeftTunnel
-	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_1F2C98
+	goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_BoyfriendGruntInTunnel
-	msgbox Route116_Text_1F3140, MSGBOX_DEFAULT
+	msgbox Route116_Text_WantToDigTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2C8E:: @ 81F2C8E
+Route116_EventScript_BoyfriendGruntLeftTunnel:: @ 81F2C8E
-	msgbox Route116_Text_1F32C1, MSGBOX_DEFAULT
+	msgbox Route116_Text_GoonHightailedItOutOfTunnel, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2C98:: @ 81F2C98
+Route116_EventScript_BoyfriendGruntInTunnel:: @ 81F2C98
-	msgbox Route116_Text_1F3166, MSGBOX_DEFAULT
+	msgbox Route116_Text_DiggingTunnelWhenGoonOrderedMeOut, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2CA2:: @ 81F2CA2
+Route116_EventScript_DevonEmployee:: @ 81F2CA2
 	lock
 	faceplayer
-	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_1F2D2B
+	goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_TryGiveRepeatBallAgain
-	msgbox Route116_Text_1F3317, MSGBOX_DEFAULT
+	msgbox Route116_Text_ThankYouTokenOfAppreciation, MSGBOX_DEFAULT
-	goto Route116_EventScript_1F2CBB
+	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_1F2CBB:: @ 81F2CBB
+Route116_EventScript_GiveRepeatBall:: @ 81F2CBB
 	setflag FLAG_MET_DEVON_EMPLOYEE
 	giveitem_std ITEM_REPEAT_BALL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if_eq Route116_EventScript_1F2D39
+	goto_if_eq Route116_EventScript_NoRoomForRepeatBall
-	msgbox Route116_Text_1F3521, MSGBOX_DEFAULT
+	msgbox Route116_Text_NewBallAvailableAtMart, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route116_EventScript_1F2D15
+	call_if_eq Route116_EventScript_DevonEmployeeExit
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route116_EventScript_1F2D20
+	call_if_eq Route116_EventScript_DevonEmployeeExitEast
 	removeobject VAR_LAST_TALKED
 	clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE
 	setflag FLAG_RECEIVED_REPEAT_BALL
 	release
 	end
 
-Route116_EventScript_1F2D15:: @ 81F2D15
+Route116_EventScript_DevonEmployeeExit:: @ 81F2D15
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D43
+	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExit
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2D20:: @ 81F2D20
+Route116_EventScript_DevonEmployeeExitEast:: @ 81F2D20
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2D4C
+	applymovement VAR_LAST_TALKED, Route116_Movement_DevonEmployeeExitEast
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2D2B:: @ 81F2D2B
+Route116_EventScript_TryGiveRepeatBallAgain:: @ 81F2D2B
-	msgbox Route116_Text_1F35CE, MSGBOX_DEFAULT
+	msgbox Route116_Text_TokenOfAppreciation, MSGBOX_DEFAULT
-	goto Route116_EventScript_1F2CBB
+	goto Route116_EventScript_GiveRepeatBall
 	end
 
-Route116_EventScript_1F2D39:: @ 81F2D39
+Route116_EventScript_NoRoomForRepeatBall:: @ 81F2D39
-	msgbox Route116_Text_1F3593, MSGBOX_DEFAULT
+	msgbox Route116_Text_BagIsJamPacked, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_Movement_1F2D43: @ 81F2D43
+Route116_Movement_DevonEmployeeExit: @ 81F2D43
 	walk_left
 	walk_left
 	walk_left
@@ -108,7 +108,7 @@ Route116_Movement_1F2D43: @ 81F2D43
 	walk_left
 	step_end
 
-Route116_Movement_1F2D4C: @ 81F2D4C
+Route116_Movement_DevonEmployeeExitEast: @ 81F2D4C
 	walk_down
 	walk_left
 	walk_left
@@ -121,104 +121,104 @@ Route116_Movement_1F2D4C: @ 81F2D4C
 	walk_left
 	step_end
 
-Route116_EventScript_1F2D57:: @ 81F2D57
+Route116_EventScript_RouteSignRustboro:: @ 81F2D57
-	msgbox Route116_Text_1F379D, MSGBOX_SIGN
+	msgbox Route116_Text_RouteSignRustboro, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D60:: @ 81F2D60
+Route116_EventScript_RusturfTunnelSign:: @ 81F2D60
-	msgbox Route116_Text_1F37B7, MSGBOX_SIGN
+	msgbox Route116_Text_RusturfTunnelSign, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D69:: @ 81F2D69
+Route116_EventScript_TunnelersRestHouseSign:: @ 81F2D69
-	msgbox Route116_Text_1F380F, MSGBOX_SIGN
+	msgbox Route116_Text_TunnelersRestHouse, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D72:: @ 81F2D72
+Route116_EventScript_TrainerTipsBToStopEvolution:: @ 81F2D72
-	msgbox Route116_Text_1F3825, MSGBOX_SIGN
+	msgbox Route116_Text_TrainerTipsBToStopEvolution, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D7B:: @ 81F2D7B
+Route116_EventScript_TrainerTipsBagHasPockets:: @ 81F2D7B
-	msgbox Route116_Text_1F38D4, MSGBOX_SIGN
+	msgbox Route116_Text_TrainerTipsBagHasPockets, MSGBOX_SIGN
 	end
 
-Route116_EventScript_1F2D84:: @ 81F2D84
+Route116_EventScript_Briney:: @ 81F2D84
 	lock
 	faceplayer
-	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
+	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	release
 	end
 
-Route116_EventScript_1F2D95:: @ 81F2D95
+Route116_EventScript_BrineyTrigger:: @ 81F2D95
 	lockall
 	applymovement 11, Common_Movement_WalkInPlaceFastestRight
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox Route116_Text_1F309D, MSGBOX_DEFAULT
+	msgbox Route116_Text_ScoundrelMadeOffWithPeeko, MSGBOX_DEFAULT
 	setvar VAR_ROUTE116_STATE, 2
 	releaseall
 	end
 
-Route116_EventScript_1F2DB6:: @ 81F2DB6
+Route116_EventScript_GlassesMan:: @ 81F2DB6
 	lock
 	faceplayer
 	checkitem ITEM_BLACK_GLASSES, 1
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route116_EventScript_1F2DF1
+	goto_if_eq Route116_EventScript_PlayerHasGlasses
 	specialvar VAR_RESULT, FoundBlackGlasses
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route116_EventScript_1F2DE2
+	goto_if_eq Route116_EventScript_FoundGlassesNotOnPlayer
-	msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
+	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2DE2:: @ 81F2DE2
+Route116_EventScript_FoundGlassesNotOnPlayer:: @ 81F2DE2
-	msgbox Route116_Text_1F3718, MSGBOX_DEFAULT
+	msgbox Route116_Text_CantFindGlassesNotHere, MSGBOX_DEFAULT
 	closemessage
-	goto Route116_EventScript_1F2E2A
+	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_1F2DF1:: @ 81F2DF1
+Route116_EventScript_PlayerHasGlasses:: @ 81F2DF1
-	msgbox Route116_Text_1F3657, MSGBOX_DEFAULT
+	msgbox Route116_Text_CanYouHelpMeFindGlasses, MSGBOX_DEFAULT
-	msgbox Route116_Text_1F3688, MSGBOX_DEFAULT
+	msgbox Route116_Text_MayISeeThoseGlasses, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, FoundBlackGlasses
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route116_EventScript_1F2E1B
+	goto_if_eq Route116_EventScript_FoundGlassesOnPlayer
-	msgbox Route116_Text_1F375E, MSGBOX_DEFAULT
+	msgbox Route116_Text_NotWhatImLookingFor, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2E1B:: @ 81F2E1B
+Route116_EventScript_FoundGlassesOnPlayer:: @ 81F2E1B
-	msgbox Route116_Text_1F36B4, MSGBOX_DEFAULT
+	msgbox Route116_Text_NotWhatImLookingForMaybeTheyArentHere, MSGBOX_DEFAULT
 	closemessage
-	goto Route116_EventScript_1F2E2A
+	goto Route116_EventScript_GlassesManExit
 	end
 
-Route116_EventScript_1F2E2A:: @ 81F2E2A
+Route116_EventScript_GlassesManExit:: @ 81F2E2A
 	delay 20
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route116_EventScript_1F2E5E
+	call_if_eq Route116_EventScript_GlassesManExitNormal
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route116_EventScript_1F2E69
+	call_if_eq Route116_EventScript_GlassesManExitEast
 	removeobject VAR_LAST_TALKED
 	release
 	end
 
-Route116_EventScript_1F2E5E:: @ 81F2E5E
+Route116_EventScript_GlassesManExitNormal:: @ 81F2E5E
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E74
+	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExit
 	waitmovement 0
 	return
 
-Route116_EventScript_1F2E69:: @ 81F2E69
+Route116_EventScript_GlassesManExitEast:: @ 81F2E69
-	applymovement VAR_LAST_TALKED, Route116_Movement_1F2E7E
+	applymovement VAR_LAST_TALKED, Route116_Movement_GlassesManExitEast
 	waitmovement 0
 	return
 
-Route116_Movement_1F2E74: @ 81F2E74
+Route116_Movement_GlassesManExit: @ 81F2E74
 	walk_left
 	walk_left
 	walk_left
@@ -230,7 +230,7 @@ Route116_Movement_1F2E74: @ 81F2E74
 	walk_left
 	step_end
 
-Route116_Movement_1F2E7E: @ 81F2E7E
+Route116_Movement_GlassesManExitEast: @ 81F2E7E
 	walk_up
 	walk_left
 	walk_left
@@ -243,133 +243,133 @@ Route116_Movement_1F2E7E: @ 81F2E7E
 	walk_left
 	step_end
 
-Route116_EventScript_1F2E89:: @ 81F2E89
+Route116_EventScript_Joey:: @ 81F2E89
-	trainerbattle_single TRAINER_JOEY, Route116_Text_29BB79, Route116_Text_29BB9A
+	trainerbattle_single TRAINER_JOEY, Route116_Text_JoeyIntro, Route116_Text_JoeyDefeat
-	msgbox Route116_Text_29BBC6, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_JoeyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2EA0:: @ 81F2EA0
+Route116_EventScript_Jose:: @ 81F2EA0
-	trainerbattle_single TRAINER_JOSE, Route116_Text_29BBFD, Route116_Text_29BC25
+	trainerbattle_single TRAINER_JOSE, Route116_Text_JoseIntro, Route116_Text_JoseDefeat
-	msgbox Route116_Text_29BC42, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_JosePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2EB7:: @ 81F2EB7
+Route116_EventScript_Jerry:: @ 81F2EB7
-	trainerbattle_single TRAINER_JERRY_1, Route116_Text_29BD0C, Route116_Text_29BD66, Route116_EventScript_1F2EF8
+	trainerbattle_single TRAINER_JERRY_1, Route116_Text_JerryIntro, Route116_Text_JerryDefeat, Route116_EventScript_TryRegisterJerryAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route116_EventScript_1F2F4E
+	goto_if_eq Route116_EventScript_RematchJerry
 	setvar VAR_0x8004, TRAINER_JERRY_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if_eq Route116_EventScript_1F2F22
+	goto_if_eq Route116_EventScript_TryRegisterJerry
-	msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
+	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2EF8:: @ 81F2EF8
+Route116_EventScript_TryRegisterJerryAfterBattle:: @ 81F2EF8
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F03
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerryAfterBattle
 	release
 	end
 
-Route116_EventScript_1F2F03:: @ 81F2F03
+Route116_EventScript_RegisterJerryAfterBattle:: @ 81F2F03
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route116_Text_29BE71, MSGBOX_DEFAULT
+	msgbox Route116_Text_JerryRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_1F2F22:: @ 81F2F22
+Route116_EventScript_TryRegisterJerry:: @ 81F2F22
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2F35
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterJerry
-	msgbox Route116_Text_29BD92, MSGBOX_DEFAULT
+	msgbox Route116_Text_JerryPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2F35:: @ 81F2F35
+Route116_EventScript_RegisterJerry:: @ 81F2F35
-	msgbox Route116_Text_29BDEF, MSGBOX_DEFAULT
+	msgbox Route116_Text_JerryRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_JERRY_1
 	release
 	end
 
-Route116_EventScript_1F2F4E:: @ 81F2F4E
+Route116_EventScript_RematchJerry:: @ 81F2F4E
-	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_29BEF3, Route116_Text_29BF4C
+	trainerbattle_rematch TRAINER_JERRY_1, Route116_Text_JerryRematchIntro, Route116_Text_JerryRematchDefeat
-	msgbox Route116_Text_29BF68, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_JerryPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F65:: @ 81F2F65
+Route116_EventScript_Clark:: @ 81F2F65
-	trainerbattle_single TRAINER_CLARK, Route116_Text_29BACD, Route116_Text_29BB0F
+	trainerbattle_single TRAINER_CLARK, Route116_Text_ClarkIntro, Route116_Text_ClarkDefeat
-	msgbox Route116_Text_29BB31, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_ClarkPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F7C:: @ 81F2F7C
+Route116_EventScript_Janice:: @ 81F2F7C
-	trainerbattle_single TRAINER_JANICE, Route116_Text_29BC7F, Route116_Text_29BCB3
+	trainerbattle_single TRAINER_JANICE, Route116_Text_JaniceIntro, Route116_Text_JaniceDefeat
-	msgbox Route116_Text_29BCCC, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_JanicePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F2F93:: @ 81F2F93
+Route116_EventScript_Karen:: @ 81F2F93
-	trainerbattle_single TRAINER_KAREN_1, Route116_Text_29BFC5, Route116_Text_29BFFA, Route116_EventScript_1F2FD4
+	trainerbattle_single TRAINER_KAREN_1, Route116_Text_KarenIntro, Route116_Text_KarenDefeat, Route116_EventScript_TryRegisterKarenAfterBattle
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route116_EventScript_1F302A
+	goto_if_eq Route116_EventScript_RematchKaren
 	setvar VAR_0x8004, TRAINER_KAREN_1
 	specialvar VAR_RESULT, IsTrainerRegistered
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
-	goto_if_eq Route116_EventScript_1F2FFE
+	goto_if_eq Route116_EventScript_TryRegisterKaren
-	msgbox Route116_Text_29C010, MSGBOX_DEFAULT
+	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F2FD4:: @ 81F2FD4
+Route116_EventScript_TryRegisterKarenAfterBattle:: @ 81F2FD4
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F2FDF
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKarenAfterBattle
 	release
 	end
 
-Route116_EventScript_1F2FDF:: @ 81F2FDF
+Route116_EventScript_RegisterKarenAfterBattle:: @ 81F2FDF
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route116_Text_29C096, MSGBOX_DEFAULT
+	msgbox Route116_Text_KarenRegister2, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_1F2FFE:: @ 81F2FFE
+Route116_EventScript_TryRegisterKaren:: @ 81F2FFE
-	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_1F3011
+	goto_if_set FLAG_HAS_MATCH_CALL, Route116_EventScript_RegisterKaren
-	msgbox Route116_Text_29C010, MSGBOX_DEFAULT
+	msgbox Route116_Text_KarenPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route116_EventScript_1F3011:: @ 81F3011
+Route116_EventScript_RegisterKaren:: @ 81F3011
-	msgbox Route116_Text_29C052, MSGBOX_DEFAULT
+	msgbox Route116_Text_KarenRegister1, MSGBOX_DEFAULT
 	register_matchcall TRAINER_KAREN_1
 	release
 	end
 
-Route116_EventScript_1F302A:: @ 81F302A
+Route116_EventScript_RematchKaren:: @ 81F302A
-	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_29C0DA, Route116_Text_29C11F
+	trainerbattle_rematch TRAINER_KAREN_1, Route116_Text_KarenRematchIntro, Route116_Text_KarenRematchDefeat
-	msgbox Route116_Text_29C13B, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_KarenPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3041:: @ 81F3041
+Route116_EventScript_Sarah:: @ 81F3041
-	trainerbattle_single TRAINER_SARAH, Route116_Text_29C173, Route116_Text_29C1B8
+	trainerbattle_single TRAINER_SARAH, Route116_Text_SarahIntro, Route116_Text_SarahDefeat
-	msgbox Route116_Text_29C1EA, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_SarahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3058:: @ 81F3058
+Route116_EventScript_Dawson:: @ 81F3058
-	trainerbattle_single TRAINER_DAWSON, Route116_Text_29C266, Route116_Text_29C2C2
+	trainerbattle_single TRAINER_DAWSON, Route116_Text_DawsonIntro, Route116_Text_DawsonDefeat
-	msgbox Route116_Text_29C2DD, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_DawsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F306F:: @ 81F306F
+Route116_EventScript_Devan:: @ 81F306F
-	trainerbattle_single TRAINER_DEVAN, Route116_Text_29C350, Route116_Text_29C365
+	trainerbattle_single TRAINER_DEVAN, Route116_Text_DevanIntro, Route116_Text_DevanDefeat
-	msgbox Route116_Text_29C380, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_DevanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_EventScript_1F3086:: @ 81F3086
+Route116_EventScript_Johnson:: @ 81F3086
-	trainerbattle_single TRAINER_JOHNSON, Route116_Text_29C3C1, Route116_Text_29C3F7
+	trainerbattle_single TRAINER_JOHNSON, Route116_Text_JohnsonIntro, Route116_Text_JohnsonDefeat
-	msgbox Route116_Text_29C418, MSGBOX_AUTOCLOSE
+	msgbox Route116_Text_JohnsonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route116_Text_1F309D: @ 81F309D
+Route116_Text_ScoundrelMadeOffWithPeeko: @ 81F309D
 	.string "Ohhh, what am I to do?\p"
 	.string "We were on our walk, PEEKO and I, when\n"
 	.string "we were jumped by an odd thug…\p"
@@ -377,11 +377,11 @@ Route116_Text_1F309D: @ 81F309D
 	.string "darling PEEKO!\p"
 	.string "Wrrrooooooaaaar! PEEKO!$"
 
-Route116_Text_1F3140: @ 81F3140
+Route116_Text_WantToDigTunnel: @ 81F3140
 	.string "Nnn… Roar!\p"
 	.string "I want to dig that tunnel!$"
 
-Route116_Text_1F3166: @ 81F3166
+Route116_Text_DiggingTunnelWhenGoonOrderedMeOut: @ 81F3166
 	.string "Nnn… Roar!\n"
 	.string "What's going on?\p"
 	.string "I was digging the tunnel without any\n"
@@ -395,12 +395,12 @@ Route116_Text_1F3166: @ 81F3166
 	.string "something stupid and startle the\l"
 	.string "POKéMON into an uproar.$"
 
-Route116_Text_1F32C1: @ 81F32C1
+Route116_Text_GoonHightailedItOutOfTunnel: @ 81F32C1
 	.string "Nnn… Roar!\p"
 	.string "That goofy goon hightailed it out of\n"
 	.string "the tunnel! I can go back to digging!$"
 
-Route116_Text_1F3317: @ 81F3317
+Route116_Text_ThankYouTokenOfAppreciation: @ 81F3317
 	.string "Oh! It's you!\p"
 	.string "You're that person who not only helped\n"
 	.string "me in PETALBURG WOODS, but also got\l"
@@ -419,61 +419,61 @@ Route116_Text_1F3317: @ 81F3317
 	.string "As a token of our appreciation, this\n"
 	.string "is our gift to our wonderful TRAINER!$"
 
-Route116_Text_1F3521: @ 81F3521
+Route116_Text_NewBallAvailableAtMart: @ 81F3521
 	.string "Our new POKé BALL will be available\n"
 	.string "at the POKéMON MART in RUSTBORO.\p"
 	.string "Please do try it out!\n"
 	.string "Thank you and bye-bye!$"
 
-Route116_Text_1F3593: @ 81F3593
+Route116_Text_BagIsJamPacked: @ 81F3593
 	.string "Your BAG is jam-packed.\n"
 	.string "I can't give you this REPEAT BALL.$"
 
-Route116_Text_1F35CE: @ 81F35CE
+Route116_Text_TokenOfAppreciation: @ 81F35CE
 	.string "As a token of our appreciation for\n"
 	.string "your delivering our package, I have\l"
 	.string "a gift of a new kind of POKé BALL\l"
 	.string "for our most wonderful TRAINER!$"
 
-Route116_Text_1F3657: @ 81F3657
+Route116_Text_CanYouHelpMeFindGlasses: @ 81F3657
 	.string "I dropped my glasses…\n"
 	.string "Can you help me find them?$"
 
-Route116_Text_1F3688: @ 81F3688
+Route116_Text_MayISeeThoseGlasses: @ 81F3688
 	.string "Those glasses!\n"
 	.string "May I see them for a second?$"
 
-Route116_Text_1F36B4: @ 81F36B4
+Route116_Text_NotWhatImLookingForMaybeTheyArentHere: @ 81F36B4
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…\p"
 	.string "Maybe my glasses aren't around\n"
 	.string "here…$"
 
-Route116_Text_1F3718: @ 81F3718
+Route116_Text_CantFindGlassesNotHere: @ 81F3718
 	.string "Hmm…\n"
 	.string "I can't find my glasses anywhere…\l"
 	.string "Maybe they're not around here…$"
 
-Route116_Text_1F375E: @ 81F375E
+Route116_Text_NotWhatImLookingFor: @ 81F375E
 	.string "Hmm…\n"
 	.string "These are BLACKGLASSES.\l"
 	.string "They're not what I'm looking for…$"
 
-Route116_Text_1F379D: @ 81F379D
+Route116_Text_RouteSignRustboro: @ 81F379D
 	.string "ROUTE 116\n"
 	.string "{LEFT_ARROW} RUSTBORO CITY$"
 
-Route116_Text_1F37B7: @ 81F37B7
+Route116_Text_RusturfTunnelSign: @ 81F37B7
 	.string "RUSTURF TUNNEL\n"
 	.string "“Linking RUSTBORO and VERDANTURF\p"
 	.string "“The tunnel project has been\n"
 	.string "canceled.”$"
 
-Route116_Text_1F380F: @ 81F380F
+Route116_Text_TunnelersRestHouse: @ 81F380F
 	.string "TUNNELER'S REST HOUSE$"
 
-Route116_Text_1F3825: @ 81F3825
+Route116_Text_TrainerTipsBToStopEvolution: @ 81F3825
 	.string "TRAINER TIPS\p"
 	.string "If you want to stop a POKéMON from\n"
 	.string "evolving, press the B Button while it\l"
@@ -481,7 +481,7 @@ Route116_Text_1F3825: @ 81F3825
 	.string "The startled POKéMON will stop.\p"
 	.string "This is called an evolution cancel.$"
 
-Route116_Text_1F38D4: @ 81F38D4
+Route116_Text_TrainerTipsBagHasPockets: @ 81F38D4
 	.string "TRAINER TIPS\p"
 	.string "Your BAG has several POCKETS.\p"
 	.string "Items you obtain are automatically\n"

data/maps/Route117/map.json

@@ -35,7 +35,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F399A",
+      "script": "Route117_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -48,7 +48,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F39A3",
+      "script": "Route117_EventScript_LittleBoy",
       "flag": "0"
     },
     {
@@ -126,7 +126,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3A94",
+      "script": "Route117_EventScript_Dylan",
       "flag": "0"
     },
     {
@@ -139,7 +139,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route117_EventScript_1F3A32",
+      "script": "Route117_EventScript_Lydia",
       "flag": "0"
     },
     {
@@ -152,7 +152,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F39D0",
+      "script": "Route117_EventScript_Isaac",
       "flag": "0"
     },
     {
@@ -243,7 +243,7 @@
       "movement_range_y": 2,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "5",
-      "script": "Route117_EventScript_1F3AF6",
+      "script": "Route117_EventScript_Maria",
       "flag": "0"
     },
     {
@@ -256,7 +256,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3B58",
+      "script": "Route117_EventScript_Derek",
       "flag": "0"
     },
     {
@@ -269,7 +269,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route117_EventScript_1F3BD3",
+      "script": "Route117_EventScript_Meg",
       "flag": "0"
     },
     {
@@ -282,7 +282,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route117_EventScript_1F3B6F",
+      "script": "Route117_EventScript_Anna",
       "flag": "0"
     },
     {
@@ -295,7 +295,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route117_EventScript_1F39AC",
+      "script": "Route117_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -308,7 +308,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C4E",
+      "script": "Route117_EventScript_Brandi",
       "flag": "0"
     },
     {
@@ -321,7 +321,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C65",
+      "script": "Route117_EventScript_Aisha",
       "flag": "0"
     },
     {
@@ -334,7 +334,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route117_EventScript_1F3C37",
+      "script": "Route117_EventScript_Melina",
       "flag": "0"
     }
   ],
@@ -355,7 +355,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39B5"
+      "script": "Route117_EventScript_RouteSignVerdanturf"
     },
     {
       "type": "sign",
@@ -363,7 +363,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39BE"
+      "script": "Route117_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -371,7 +371,7 @@
       "y": 5,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route117_EventScript_1F39C7"
+      "script": "Route117_EventScript_DayCareSign"
     },
     {
       "type": "hidden_item",

data/maps/Route117/scripts.inc

@@ -3,211 +3,210 @@ Route117_MapScripts:: @ 81F397D
 	.byte 0
 
 Route117_OnTransition: @ 81F3983
-	call Route117_EventScript_1F3989
+	call Route117_EventScript_TryMoveDayCareMan
 	end
 
-Route117_EventScript_1F3989:: @ 81F3989
+Route117_EventScript_TryMoveDayCareMan:: @ 81F3989
-	goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_1F3999
+	goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_StopMoveDayCareMan
 	setobjectxyperm 3, 47, 6
-
+Route117_EventScript_StopMoveDayCareMan:: @ 81F3999
-Route117_EventScript_1F3999:: @ 81F3999
 	return
 
-Route117_EventScript_1F399A:: @ 81F399A
+Route117_EventScript_Woman:: @ 81F399A
-	msgbox Route117_Text_1F3CFD, MSGBOX_NPC
+	msgbox Route117_Text_ArentTheseFlowersPretty, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39A3:: @ 81F39A3
+Route117_EventScript_LittleBoy:: @ 81F39A3
-	msgbox Route117_Text_1F3D41, MSGBOX_NPC
+	msgbox Route117_Text_AirIsTastyHere, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39AC:: @ 81F39AC
+Route117_EventScript_Girl:: @ 81F39AC
-	msgbox Route117_Text_1F3C7C, MSGBOX_NPC
+	msgbox Route117_Text_DayCarePokemonHadNewMove, MSGBOX_NPC
 	end
 
-Route117_EventScript_1F39B5:: @ 81F39B5
+Route117_EventScript_RouteSignVerdanturf:: @ 81F39B5
-	msgbox Route117_Text_1F3D58, MSGBOX_SIGN
+	msgbox Route117_Text_RouteSignVerdanturf, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39BE:: @ 81F39BE
+Route117_EventScript_RouteSignMauville:: @ 81F39BE
-	msgbox Route117_Text_1F3D74, MSGBOX_SIGN
+	msgbox Route117_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39C7:: @ 81F39C7
+Route117_EventScript_DayCareSign:: @ 81F39C7
-	msgbox Route117_Text_1F3D8E, MSGBOX_SIGN
+	msgbox Route117_Text_DayCareSign, MSGBOX_SIGN
 	end
 
-Route117_EventScript_1F39D0:: @ 81F39D0
+Route117_EventScript_Isaac:: @ 81F39D0
-	trainerbattle_single TRAINER_ISAAC_1, Route117_Text_29C43F, Route117_Text_29C47A, Route117_EventScript_1F39FC
+	trainerbattle_single TRAINER_ISAAC_1, Route117_Text_IsaacIntro, Route117_Text_IsaacDefeat, Route117_EventScript_RegisterIsaac
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route117_EventScript_1F3A1B
+	goto_if_eq Route117_EventScript_RematchIsaac
-	msgbox Route117_Text_29C498, MSGBOX_DEFAULT
+	msgbox Route117_Text_IsaacPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F39FC:: @ 81F39FC
+Route117_EventScript_RegisterIsaac:: @ 81F39FC
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C508, MSGBOX_DEFAULT
+	msgbox Route117_Text_IsaacRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ISAAC_1
 	release
 	end
 
-Route117_EventScript_1F3A1B:: @ 81F3A1B
+Route117_EventScript_RematchIsaac:: @ 81F3A1B
-	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_29C549, Route117_Text_29C58B
+	trainerbattle_rematch TRAINER_ISAAC_1, Route117_Text_IsaacRematchIntro, Route117_Text_IsaacRematchDefeat
-	msgbox Route117_Text_29C5D0, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_IsaacPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3A32:: @ 81F3A32
+Route117_EventScript_Lydia:: @ 81F3A32
-	trainerbattle_single TRAINER_LYDIA_1, Route117_Text_29C612, Route117_Text_29C659, Route117_EventScript_1F3A5E
+	trainerbattle_single TRAINER_LYDIA_1, Route117_Text_LydiaIntro, Route117_Text_LydiaDefeat, Route117_EventScript_RegisterLydia
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route117_EventScript_1F3A7D
+	goto_if_eq Route117_EventScript_RematchLydia
-	msgbox Route117_Text_29C679, MSGBOX_DEFAULT
+	msgbox Route117_Text_LydiaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3A5E:: @ 81F3A5E
+Route117_EventScript_RegisterLydia:: @ 81F3A5E
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C6BC, MSGBOX_DEFAULT
+	msgbox Route117_Text_LydiaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_LYDIA_1
 	release
 	end
 
-Route117_EventScript_1F3A7D:: @ 81F3A7D
+Route117_EventScript_RematchLydia:: @ 81F3A7D
-	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_29C6FD, Route117_Text_29C73E
+	trainerbattle_rematch TRAINER_LYDIA_1, Route117_Text_LydiaRematchIntro, Route117_Text_LydiaRematchDefeat
-	msgbox Route117_Text_29C75A, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_LydiaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3A94:: @ 81F3A94
+Route117_EventScript_Dylan:: @ 81F3A94
-	trainerbattle_single TRAINER_DYLAN_1, Route117_Text_29C7A5, Route117_Text_29C7EB, Route117_EventScript_1F3AC0
+	trainerbattle_single TRAINER_DYLAN_1, Route117_Text_DylanIntro, Route117_Text_DylanDefeat, Route117_EventScript_RegisterDylan
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route117_EventScript_1F3ADF
+	goto_if_eq Route117_EventScript_RematchDylan
-	msgbox Route117_Text_29C800, MSGBOX_DEFAULT
+	msgbox Route117_Text_DylanPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3AC0:: @ 81F3AC0
+Route117_EventScript_RegisterDylan:: @ 81F3AC0
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29C846, MSGBOX_DEFAULT
+	msgbox Route117_Text_DylanRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DYLAN_1
 	release
 	end
 
-Route117_EventScript_1F3ADF:: @ 81F3ADF
+Route117_EventScript_RematchDylan:: @ 81F3ADF
-	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_29C880, Route117_Text_29C8E3
+	trainerbattle_rematch TRAINER_DYLAN_1, Route117_Text_DylanRematchIntro, Route117_Text_DylanRematchDefeat
-	msgbox Route117_Text_29C8FE, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_DylanPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3AF6:: @ 81F3AF6
+Route117_EventScript_Maria:: @ 81F3AF6
-	trainerbattle_single TRAINER_MARIA_1, Route117_Text_29C955, Route117_Text_29C9A6, Route117_EventScript_1F3B22
+	trainerbattle_single TRAINER_MARIA_1, Route117_Text_MariaIntro, Route117_Text_MariaDefeat, Route117_EventScript_RegisterMaria
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route117_EventScript_1F3B41
+	goto_if_eq Route117_EventScript_RematchMaria
-	msgbox Route117_Text_29C9D0, MSGBOX_DEFAULT
+	msgbox Route117_Text_MariaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3B22:: @ 81F3B22
+Route117_EventScript_RegisterMaria:: @ 81F3B22
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route117_Text_29CA32, MSGBOX_DEFAULT
+	msgbox Route117_Text_MariaRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_MARIA_1
 	release
 	end
 
-Route117_EventScript_1F3B41:: @ 81F3B41
+Route117_EventScript_RematchMaria:: @ 81F3B41
-	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_29CA7C, Route117_Text_29CACC
+	trainerbattle_rematch TRAINER_MARIA_1, Route117_Text_MariaRematchIntro, Route117_Text_MariaRematchDefeat
-	msgbox Route117_Text_29CAF6, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_MariaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3B58:: @ 81F3B58
+Route117_EventScript_Derek:: @ 81F3B58
-	trainerbattle_single TRAINER_DEREK, Route117_Text_29CB32, Route117_Text_29CB87
+	trainerbattle_single TRAINER_DEREK, Route117_Text_DerekIntro, Route117_Text_DerekDefeat
-	msgbox Route117_Text_29CBAD, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_DerekPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3B6F:: @ 81F3B6F
+Route117_EventScript_Anna:: @ 81F3B6F
-	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CC4A, Route117_Text_29CC8E, Route117_Text_29CD61, Route117_EventScript_1F3B9F
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaIntro, Route117_Text_AnnaDefeat, Route117_Text_AnnaNotEnoughMons, Route117_EventScript_RegisterAnna
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route117_EventScript_1F3BB8
+	goto_if_eq Route117_EventScript_RematchAnna
-	msgbox Route117_Text_29CCCB, MSGBOX_DEFAULT
+	msgbox Route117_Text_AnnaPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3B9F:: @ 81F3B9F
+Route117_EventScript_RegisterAnna:: @ 81F3B9F
-	msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT
+	msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANNA_AND_MEG_1
 	release
 	end
 
-Route117_EventScript_1F3BB8:: @ 81F3BB8
+Route117_EventScript_RematchAnna:: @ 81F3BB8
-	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CEB6, Route117_Text_29CEF6, Route117_Text_29CF6E
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_AnnaRematchIntro, Route117_Text_AnnaRematchDefeat, Route117_Text_AnnaRematchNotEnoughMons
-	msgbox Route117_Text_29CF1C, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_AnnaPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3BD3:: @ 81F3BD3
+Route117_EventScript_Meg:: @ 81F3BD3
-	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CD9D, Route117_Text_29CDE9, Route117_Text_29CE52, Route117_EventScript_1F3C03
+	trainerbattle_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegIntro, Route117_Text_MegDefeat, Route117_Text_MegNotEnoughMons, Route117_EventScript_RegisterMeg
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route117_EventScript_1F3C1C
+	goto_if_eq Route117_EventScript_RematchMeg
-	msgbox Route117_Text_29CE17, MSGBOX_DEFAULT
+	msgbox Route117_Text_MegPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route117_EventScript_1F3C03:: @ 81F3C03
+Route117_EventScript_RegisterMeg:: @ 81F3C03
-	msgbox Route117_Text_29CD1D, MSGBOX_DEFAULT
+	msgbox Route117_Text_AnnaAndMegRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ANNA_AND_MEG_1
 	release
 	end
 
-Route117_EventScript_1F3C1C:: @ 81F3C1C
+Route117_EventScript_RematchMeg:: @ 81F3C1C
-	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_29CFAA, Route117_Text_29CFED, Route117_Text_29D053
+	trainerbattle_rematch_double TRAINER_ANNA_AND_MEG_1, Route117_Text_MegRematchIntro, Route117_Text_MegRematchDefeat, Route117_Text_MegRematchNotEnoughMons
-	msgbox Route117_Text_29CFFE, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_MegPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C37:: @ 81F3C37
+Route117_EventScript_Melina:: @ 81F3C37
-	trainerbattle_single TRAINER_MELINA, Route117_Text_29D0B7, Route117_Text_29D0F1
+	trainerbattle_single TRAINER_MELINA, Route117_Text_MelinaIntro, Route117_Text_MelinaDefeat
-	msgbox Route117_Text_29D10E, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_MelinaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C4E:: @ 81F3C4E
+Route117_EventScript_Brandi:: @ 81F3C4E
-	trainerbattle_single TRAINER_BRANDI, Route117_Text_29D14B, Route117_Text_29D189
+	trainerbattle_single TRAINER_BRANDI, Route117_Text_BrandiIntro, Route117_Text_BrandiDefeat
-	msgbox Route117_Text_29D196, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_BrandiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_EventScript_1F3C65:: @ 81F3C65
+Route117_EventScript_Aisha:: @ 81F3C65
-	trainerbattle_single TRAINER_AISHA, Route117_Text_29D1D1, Route117_Text_29D206
+	trainerbattle_single TRAINER_AISHA, Route117_Text_AishaIntro, Route117_Text_AishaDefeat
-	msgbox Route117_Text_29D24C, MSGBOX_AUTOCLOSE
+	msgbox Route117_Text_AishaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route117_Text_1F3C7C: @ 81F3C7C
+Route117_Text_DayCarePokemonHadNewMove: @ 81F3C7C
 	.string "I left my POKéMON at the DAY CARE.\p"
 	.string "When I got it back, it had a new move\n"
 	.string "that I didn't teach it.\l"
 	.string "I was really, really surprised.$"
 
-Route117_Text_1F3CFD: @ 81F3CFD
+Route117_Text_ArentTheseFlowersPretty: @ 81F3CFD
 	.string "What do you think?\n"
 	.string "Aren't these flowers pretty?\p"
 	.string "I planted them all!$"
 
-Route117_Text_1F3D41: @ 81F3D41
+Route117_Text_AirIsTastyHere: @ 81F3D41
 	.string "The air is tasty here!$"
 
-Route117_Text_1F3D58: @ 81F3D58
+Route117_Text_RouteSignVerdanturf: @ 81F3D58
 	.string "ROUTE 117\n"
 	.string "{LEFT_ARROW} VERDANTURF TOWN$"
 
-Route117_Text_1F3D74: @ 81F3D74
+Route117_Text_RouteSignMauville: @ 81F3D74
 	.string "ROUTE 117\n"
 	.string "{RIGHT_ARROW} MAUVILLE CITY$"
 
-Route117_Text_1F3D8E: @ 81F3D8E
+Route117_Text_DayCareSign: @ 81F3D8E
 	.string "POKéMON DAY CARE\n"
 	.string "“Let us raise your POKéMON.”$"
 

data/maps/Route118/map.json

@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4079",
+      "script": "Route118_EventScript_Perry",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F3E73",
+      "script": "Route118_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_GabbyBattle5",
+      "script": "GabbyAndTy_EventScript_GabbyBattle5",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_TyBattle5",
+      "script": "GabbyAndTy_EventScript_TyBattle5",
       "flag": "FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F3E14",
+      "script": "Route118_EventScript_GoodRodFisherman",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route118_EventScript_1F3F87",
+      "script": "Route118_EventScript_Rose",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route118_EventScript_1F4000",
+      "script": "Route118_EventScript_Wade",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4090",
+      "script": "Route118_EventScript_Chester",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route118_EventScript_1F3FE9",
+      "script": "Route118_EventScript_Barny",
       "flag": "0"
     },
     {
@@ -261,7 +261,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route118_EventScript_1F4017",
+      "script": "Route118_EventScript_Dalton",
       "flag": "0"
     },
     {
@@ -300,7 +300,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route118_EventScript_1F40A7",
+      "script": "Route118_EventScript_Deandre",
       "flag": "0"
     }
   ],
@@ -328,7 +328,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3E8E"
+      "script": "Route118_EventScript_StevenTrigger0"
     },
     {
       "type": "trigger",
@@ -337,7 +337,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3EAE"
+      "script": "Route118_EventScript_StevenTrigger1"
     },
     {
       "type": "trigger",
@@ -346,7 +346,7 @@
       "elevation": 3,
       "var": "VAR_ROUTE118_STATE",
       "var_value": "0",
-      "script": "Route118_EventScript_1F3EC4"
+      "script": "Route118_EventScript_StevenTrigger2"
     }
   ],
   "bg_events": [
@@ -363,7 +363,7 @@
       "y": 6,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route118_EventScript_1F3E7C"
+      "script": "Route118_EventScript_RouteSignMauville"
     },
     {
       "type": "sign",
@@ -371,7 +371,7 @@
       "y": 8,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route118_EventScript_1F3E85"
+      "script": "Route118_EventScript_RouteSign119"
     },
     {
       "type": "secret_base",

data/maps/Route118/scripts.inc

@@ -1,7 +1,7 @@
 Route118_MapScripts:: @ 81F3DBC
 	map_script MAP_SCRIPT_ON_TRANSITION, Route118_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route118_MapScript1_1F3DF3
+	map_script MAP_SCRIPT_ON_LOAD, Route118_OnLoad
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_MapScript2_1F3E0A
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route118_OnFrame
 	.byte 0
 
 Route118_OnTransition: @ 81F3DCC
@@ -14,142 +14,142 @@ Route118_OnTransition: @ 81F3DCC
 	call_if_eq UnusualWeather_StartGroudonWeather
 	end
 
-Route118_MapScript1_1F3DF3: @ 81F3DF3
+Route118_OnLoad: @ 81F3DF3
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_EAST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118East
 	compare VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_ROUTE_118_WEST
 	call_if_eq UnusualWeather_EventScript_PlaceTilesRoute118West
 	end
 
-Route118_MapScript2_1F3E0A: @ 81F3E0A
+Route118_OnFrame: @ 81F3E0A
 	map_script_2 VAR_SHOULD_END_UNUSUAL_WEATHER, 1, UnusualWeather_EventScript_EndEventAndCleanup_1
 	.2byte 0
 
-Route118_EventScript_1F3E14:: @ 81F3E14
+Route118_EventScript_GoodRodFisherman:: @ 81F3E14
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_1F3E69
+	goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_ReceivedGoodRod
-	msgbox Route118_Text_1F427B, MSGBOX_YESNO
+	msgbox Route118_Text_YouAgreeGoodRodIsGood, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq Route118_EventScript_1F3E3E
+	goto_if_eq Route118_EventScript_ReceiveGoodRod
 	compare VAR_RESULT, NO
-	goto_if_eq Route118_EventScript_1F3E5F
+	goto_if_eq Route118_EventScript_DeclineGoodRod
 	end
 
-Route118_EventScript_1F3E3E:: @ 81F3E3E
+Route118_EventScript_ReceiveGoodRod:: @ 81F3E3E
-	msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT
+	msgbox Route118_Text_IdenticalMindsTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_GOOD_ROD
 	setflag FLAG_RECEIVED_GOOD_ROD
-	msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT
+	msgbox Route118_Text_TryYourLuckFishing, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E5F:: @ 81F3E5F
+Route118_EventScript_DeclineGoodRod:: @ 81F3E5F
-	msgbox Route118_Text_1F4319, MSGBOX_DEFAULT
+	msgbox Route118_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E69:: @ 81F3E69
+Route118_EventScript_ReceivedGoodRod:: @ 81F3E69
-	msgbox Route118_Text_1F4331, MSGBOX_DEFAULT
+	msgbox Route118_Text_TryCatchingMonWithGoodRod, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3E73:: @ 81F3E73
+Route118_EventScript_Girl:: @ 81F3E73
-	msgbox Route118_Text_1F4367, MSGBOX_NPC
+	msgbox Route118_Text_CanCrossRiversWithSurf, MSGBOX_NPC
 	end
 
-Route118_EventScript_1F3E7C:: @ 81F3E7C
+Route118_EventScript_RouteSignMauville:: @ 81F3E7C
-	msgbox Route118_Text_1F43F4, MSGBOX_SIGN
+	msgbox Route118_Text_RouteSignMauville, MSGBOX_SIGN
 	end
 
-Route118_EventScript_1F3E85:: @ 81F3E85
+Route118_EventScript_RouteSign119:: @ 81F3E85
-	msgbox Route118_Text_1F440E, MSGBOX_SIGN
+	msgbox Route118_Text_RouteSign119, MSGBOX_SIGN
 	end
 
-Route118_EventScript_1F3E8E:: @ 81F3E8E
+Route118_EventScript_StevenTrigger0:: @ 81F3E8E
 	lockall
 	setvar VAR_0x8008, 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F61
+	applymovement 19, Route118_Movement_StevenApproachLedge0
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EAE:: @ 81F3EAE
+Route118_EventScript_StevenTrigger1:: @ 81F3EAE
 	lockall
 	setvar VAR_0x8008, 1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EC4:: @ 81F3EC4
+Route118_EventScript_StevenTrigger2:: @ 81F3EC4
 	lockall
 	setvar VAR_0x8008, 2
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
-	applymovement 19, Route118_Movement_1F3F63
+	applymovement 19, Route118_Movement_StevenApproachLedge2
 	waitmovement 0
-	goto Route118_EventScript_1F3EE4
+	goto Route118_EventScript_StevenTrigger
 	end
 
-Route118_EventScript_1F3EE4:: @ 81F3EE4
+Route118_EventScript_StevenTrigger:: @ 81F3EE4
 	playse SE_DANSA
-	applymovement 19, Route118_Movement_1F3F65
+	applymovement 19, Route118_Movement_StevenJumpLedge
 	waitmovement 0
 	delay 30
-	msgbox Route118_Text_1F40BE, MSGBOX_DEFAULT
+	msgbox Route118_Text_StevenQuestions, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_0x8008, 0
-	call_if_eq Route118_EventScript_1F3F28
+	call_if_eq Route118_EventScript_StevenExit0
 	compare VAR_0x8008, 1
-	call_if_eq Route118_EventScript_1F3F3A
+	call_if_eq Route118_EventScript_StevenExit1
 	compare VAR_0x8008, 2
-	call_if_eq Route118_EventScript_1F3F4C
+	call_if_eq Route118_EventScript_StevenExit2
 	setvar VAR_ROUTE118_STATE, 1
 	removeobject 19
 	releaseall
 	end
 
-Route118_EventScript_1F3F28:: @ 81F3F28
+Route118_EventScript_StevenExit0:: @ 81F3F28
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
-	applymovement 19, Route118_Movement_1F3F69
+	applymovement 19, Route118_Movement_StevenExit0
 	waitmovement 0
 	return
 
-Route118_EventScript_1F3F3A:: @ 81F3F3A
+Route118_EventScript_StevenExit1:: @ 81F3F3A
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
-	applymovement 19, Route118_Movement_1F3F74
+	applymovement 19, Route118_Movement_StevenExit1
 	waitmovement 0
 	return
 
-Route118_EventScript_1F3F4C:: @ 81F3F4C
+Route118_EventScript_StevenExit2:: @ 81F3F4C
-	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_1F3F5E
+	applymovement EVENT_OBJ_ID_PLAYER, Route118_Movement_PlayerWatchStevenExit
-	applymovement 19, Route118_Movement_1F3F7E
+	applymovement 19, Route118_Movement_StevenExit2
 	waitmovement 0
 	return
 
-Route118_Movement_1F3F5E: @ 81F3F5E
+Route118_Movement_PlayerWatchStevenExit: @ 81F3F5E
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-Route118_Movement_1F3F61: @ 81F3F61
+Route118_Movement_StevenApproachLedge0: @ 81F3F61
 	walk_left
 	step_end
 
-Route118_Movement_1F3F63: @ 81F3F63
+Route118_Movement_StevenApproachLedge2: @ 81F3F63
 	walk_right
 	step_end
 
-Route118_Movement_1F3F65: @ 81F3F65
+Route118_Movement_StevenJumpLedge: @ 81F3F65
 	jump_2_down
 	delay_16
 	walk_down
 	step_end
 
-Route118_Movement_1F3F69: @ 81F3F69
+Route118_Movement_StevenExit0: @ 81F3F69
 	walk_right
 	walk_right
 	walk_right
@@ -162,7 +162,7 @@ Route118_Movement_1F3F69: @ 81F3F69
 	walk_right
 	step_end
 
-Route118_Movement_1F3F74: @ 81F3F74
+Route118_Movement_StevenExit1: @ 81F3F74
 	walk_right
 	walk_right
 	walk_right
@@ -174,7 +174,7 @@ Route118_Movement_1F3F74: @ 81F3F74
 	walk_right
 	step_end
 
-Route118_Movement_1F3F7E: @ 81F3F7E
+Route118_Movement_StevenExit2: @ 81F3F7E
 	walk_right
 	walk_right
 	walk_right
@@ -185,76 +185,76 @@ Route118_Movement_1F3F7E: @ 81F3F7E
 	walk_right
 	step_end
 
-Route118_EventScript_1F3F87:: @ 81F3F87
+Route118_EventScript_Rose:: @ 81F3F87
-	trainerbattle_single TRAINER_ROSE_1, Route118_Text_29D290, Route118_Text_29D2D8, Route118_EventScript_1F3FB3
+	trainerbattle_single TRAINER_ROSE_1, Route118_Text_RoseIntro, Route118_Text_RoseDefeat, Route118_EventScript_RegisterRose
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route118_EventScript_1F3FD2
+	goto_if_eq Route118_EventScript_RematchRose
-	msgbox Route118_Text_29D2FA, MSGBOX_DEFAULT
+	msgbox Route118_Text_RosePostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F3FB3:: @ 81F3FB3
+Route118_EventScript_RegisterRose:: @ 81F3FB3
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route118_Text_29D343, MSGBOX_DEFAULT
+	msgbox Route118_Text_RoseRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_ROSE_1
 	release
 	end
 
-Route118_EventScript_1F3FD2:: @ 81F3FD2
+Route118_EventScript_RematchRose:: @ 81F3FD2
-	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_29D382, Route118_Text_29D3AA
+	trainerbattle_rematch TRAINER_ROSE_1, Route118_Text_RoseRematchIntro, Route118_Text_RoseRematchDefeat
-	msgbox Route118_Text_29D3D9, MSGBOX_AUTOCLOSE
+	msgbox Route118_Text_RosePostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F3FE9:: @ 81F3FE9
+Route118_EventScript_Barny:: @ 81F3FE9
-	trainerbattle_single TRAINER_BARNY, Route118_Text_29D515, Route118_Text_29D55C
+	trainerbattle_single TRAINER_BARNY, Route118_Text_BarnyIntro, Route118_Text_BarnyDefeat
-	msgbox Route118_Text_29D587, MSGBOX_AUTOCLOSE
+	msgbox Route118_Text_BarnyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4000:: @ 81F4000
+Route118_EventScript_Wade:: @ 81F4000
-	trainerbattle_single TRAINER_WADE, Route118_Text_29D5DF, Route118_Text_29D64C
+	trainerbattle_single TRAINER_WADE, Route118_Text_WadeIntro, Route118_Text_WadeDefeat
-	msgbox Route118_Text_29D663, MSGBOX_AUTOCLOSE
+	msgbox Route118_Text_WadePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4017:: @ 81F4017
+Route118_EventScript_Dalton:: @ 81F4017
-	trainerbattle_single TRAINER_DALTON_1, Route118_Text_29D6AF, Route118_Text_29D6CD, Route118_EventScript_1F4043
+	trainerbattle_single TRAINER_DALTON_1, Route118_Text_DaltonIntro, Route118_Text_DaltonDefeat, Route118_EventScript_RegisterDalton
 	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
-	goto_if_eq Route118_EventScript_1F4062
+	goto_if_eq Route118_EventScript_RematchDalton
-	msgbox Route118_Text_29D6D8, MSGBOX_DEFAULT
+	msgbox Route118_Text_DaltonPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_1F4043:: @ 81F4043
+Route118_EventScript_RegisterDalton:: @ 81F4043
 	special PlayerFaceTrainerAfterBattle
 	waitmovement 0
-	msgbox Route118_Text_29D74A, MSGBOX_DEFAULT
+	msgbox Route118_Text_DaltonRegister, MSGBOX_DEFAULT
 	register_matchcall TRAINER_DALTON_1
 	release
 	end
 
-Route118_EventScript_1F4062:: @ 81F4062
+Route118_EventScript_RematchDalton:: @ 81F4062
-	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_29D789, Route118_Text_29D7CA
+	trainerbattle_rematch TRAINER_DALTON_1, Route118_Text_DaltonRematchIntro, Route118_Text_DaltonRematchDefeat
-	msgbox Route118_Text_29D7D5, MSGBOX_AUTOCLOSE
+	msgbox Route118_Text_DaltonPostRematch, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4079:: @ 81F4079
+Route118_EventScript_Perry:: @ 81F4079
-	trainerbattle_single TRAINER_PERRY, Route118_Text_29D41D, Route118_Text_29D45B
+	trainerbattle_single TRAINER_PERRY, Route118_Text_PerryIntro, Route118_Text_PerryDefeat
-	msgbox Route118_Text_29D46C, MSGBOX_AUTOCLOSE
+	msgbox Route118_Text_PerryPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F4090:: @ 81F4090
+Route118_EventScript_Chester:: @ 81F4090
-	trainerbattle_single TRAINER_CHESTER, Route118_Text_29D4A6, Route118_Text_29D4C4
+	trainerbattle_single TRAINER_CHESTER, Route118_Text_ChesterIntro, Route118_Text_ChesterDefeat
-	msgbox Route118_Text_29D4DA, MSGBOX_AUTOCLOSE
+	msgbox Route118_Text_ChesterPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_EventScript_1F40A7:: @ 81F40A7
+Route118_EventScript_Deandre:: @ 81F40A7
-	trainerbattle_single TRAINER_DEANDRE, Route118_Text_29D81B, Route118_Text_29D83C
+	trainerbattle_single TRAINER_DEANDRE, Route118_Text_DeandreIntro, Route118_Text_DeandreDefeat
-	msgbox Route118_Text_29D872, MSGBOX_AUTOCLOSE
+	msgbox Route118_Text_DeandrePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route118_Text_1F40BE: @ 81F40BE
+Route118_Text_StevenQuestions: @ 81F40BE
 	.string "STEVEN: Hi, {PLAYER}{KUN}!\p"
 	.string "It's me, STEVEN!\n"
 	.string "We met in the cave near DEWFORD.\p"
@@ -272,40 +272,40 @@ Route118_Text_1F40BE: @ 81F40BE
 	.string "It would be nice if we were to meet\n"
 	.string "again somewhere.$"
 
-Route118_Text_1F427B: @ 81F427B
+Route118_Text_YouAgreeGoodRodIsGood: @ 81F427B
 	.string "Hmm!\n"
 	.string "A GOOD ROD is really good!\p"
 	.string "Wouldn't you agree?$"
 
-Route118_Text_1F42AF: @ 81F42AF
+Route118_Text_IdenticalMindsTakeThis: @ 81F42AF
 	.string "Hmm!\n"
 	.string "We're of identical minds!\p"
 	.string "Hmm!\n"
 	.string "Take this GOOD ROD!$"
 
-Route118_Text_1F42E7: @ 81F42E7
+Route118_Text_TryYourLuckFishing: @ 81F42E7
 	.string "Wherever there's water, try your luck\n"
 	.string "at fishing.$"
 
-Route118_Text_1F4319: @ 81F4319
+Route118_Text_DontYouLikeToFish: @ 81F4319
 	.string "Don't you like to fish?$"
 
-Route118_Text_1F4331: @ 81F4331
+Route118_Text_TryCatchingMonWithGoodRod: @ 81F4331
 	.string "Try catching all sorts of POKéMON\n"
 	.string "with your GOOD ROD.$"
 
-Route118_Text_1F4367: @ 81F4367
+Route118_Text_CanCrossRiversWithSurf: @ 81F4367
 	.string "Even if there isn't a boat, you can\n"
 	.string "cross rivers and the sea if you have\l"
 	.string "a POKéMON that knows SURF.\p"
 	.string "POKéMON can be counted on to do so\n"
 	.string "much!$"
 
-Route118_Text_1F43F4: @ 81F43F4
+Route118_Text_RouteSignMauville: @ 81F43F4
 	.string "ROUTE 118\n"
 	.string "{LEFT_ARROW} MAUVILLE CITY$"
 
-Route118_Text_1F440E: @ 81F440E
+Route118_Text_RouteSign119: @ 81F440E
 	.string "ROUTE 118\n"
 	.string "{UP_ARROW} ROUTE 119$"
 

data/maps/RustboroCity_DevonCorp_3F/scripts.inc

@@ -60,7 +60,7 @@ RustboroCity_DevonCorp_3F_EventScript_MeetPresident:: @ 821246E
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
 	msgbox RustboroCity_DevonCorp_3F_Text_MrStoneGoWithCautionAndCare, MSGBOX_DEFAULT
-	setflag FLAG_HIDE_ROUTE_116_TUNNELER
+	setflag FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND
 	clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDAS_BOYFRIEND
 	clearflag FLAG_HIDE_RUSTURF_TUNNEL_WANDA
 	clearflag FLAG_HIDE_BRINEYS_HOUSE_MR_BRINEY

data/scripts/gabby_and_ty.inc

@@ -184,13 +184,13 @@ GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6
 	release
 	end
 
-Route118_EventScript_GabbyBattle5:: @ 828CED6
+GabbyAndTy_EventScript_GabbyBattle5:: @ 828CED6
 	trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_TyBattle5:: @ 828CEF6
+GabbyAndTy_EventScript_TyBattle5:: @ 828CEF6
 	trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
 	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release

data/text/berries.inc

@@ -18,32 +18,32 @@ Route104_Text_2A6E32: @ 82A6E32
 	.string "It's up to you whether to grow BERRIES\n"
 	.string "or use them.$"
 
-Route111_Text_2A6EBD: @ 82A6EBD
+Route111_Text_WateredPlantsEveryDayTakeBerry: @ 82A6EBD
 	.string "I watered the plants every day.\n"
 	.string "They grew lots of flowers.\p"
 	.string "And they gave me lots of BERRIES, too.\p"
 	.string "Here you go!\n"
 	.string "You can have it!$"
 
-Route111_Text_2A6F3D: @ 82A6F3D
+Route111_Text_GoingToTryToMakeDifferentColorBerries: @ 82A6F3D
 	.string "I'm going to try really hard and make\n"
 	.string "BERRIES in different colors.\p"
 	.string "I hope you try hard, too!$"
 
-Route111_Text_2A6F9A: @ 82A6F9A
+Route111_Text_WhatColorBerriesToLookForToday: @ 82A6F9A
 	.string "I wonder what color BERRIES I'll look\n"
 	.string "for today?$"
 
-Route114_Text_2A6FCB: @ 82A6FCB
+Route114_Text_LoveUsingBerryCrushShareBerry: @ 82A6FCB
 	.string "I love using the BERRY CRUSH machine,\n"
 	.string "so I'm collecting BERRIES.\p"
 	.string "I'll share one with you, if you'd like.$"
 
-Route114_Text_2A7034: @ 82A7034
+Route114_Text_TryBerryCrushWithFriends: @ 82A7034
 	.string "You should try the BERRY CRUSH\n"
 	.string "machine with your friends.$"
 
-Route114_Text_2A706E: @ 82A706E
+Route114_Text_FunToThinkAboutBerries: @ 82A706E
 	.string "Which BERRY should be planted?\n"
 	.string "Should you use or hoard BERRIES?\p"
 	.string "It's fun to think about.$"

include/constants/flags.h

@@ -934,7 +934,7 @@
 #define FLAG_HIDE_ROUTE_116_MR_BRINEY                               0x37B
 #define FLAG_HIDE_WEATHER_INSTITUTE_1F_WORKERS                      0x37C
 #define FLAG_HIDE_WEATHER_INSTITUTE_2F_WORKERS                      0x37D
-#define FLAG_HIDE_ROUTE_116_TUNNELER                                0x37E
+#define FLAG_HIDE_ROUTE_116_WANDAS_BOYFRIEND                        0x37E
 #define FLAG_HIDE_LILYCOVE_CONTEST_HALL_CONTEST_ATTENDANT_2         0x37F
 #define FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_UNKNOWN_0x380          0x380
 #define FLAG_HIDE_ROUTE_101_BIRCH                                   0x381

include/constants/items.h

@@ -467,18 +467,24 @@
 
 #define FIRST_BERRY_INDEX             ITEM_CHERI_BERRY
 #define LAST_BERRY_INDEX              ITEM_ENIGMA_BERRY
+
+// Range of berries given out by various NPCS
 #define FIRST_BERRY_MASTER_BERRY      ITEM_POMEG_BERRY
 #define LAST_BERRY_MASTER_BERRY       ITEM_NOMEL_BERRY
 #define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY
 #define LAST_BERRY_MASTER_WIFE_BERRY  ITEM_SITRUS_BERRY
 #define FIRST_KIRI_BERRY              ITEM_POMEG_BERRY
 #define LAST_KIRI_BERRY               ITEM_NOMEL_BERRY
+#define FIRST_ROUTE_114_MAN_BERRY     ITEM_RAZZ_BERRY
+#define LAST_ROUTE_114_MAN_BERRY      ITEM_PINAP_BERRY
 
-#define NUM_BERRY_MASTER_BERRIES         LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1
+#define NUM_BERRY_MASTER_BERRIES          LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1
-#define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX
+#define NUM_BERRY_MASTER_BERRIES_SKIPPED  FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX
-#define NUM_BERRY_MASTER_WIFE_BERRIES    LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1
+#define NUM_BERRY_MASTER_WIFE_BERRIES     LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1
-#define NUM_KIRI_BERRIES                 LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1
+#define NUM_KIRI_BERRIES                  LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1
-#define NUM_KIRI_BERRIES_SKIPPED         FIRST_KIRI_BERRY - FIRST_BERRY_INDEX
+#define NUM_KIRI_BERRIES_SKIPPED          FIRST_KIRI_BERRY - FIRST_BERRY_INDEX
+#define NUM_ROUTE_114_MAN_BERRIES         LAST_ROUTE_114_MAN_BERRY - FIRST_ROUTE_114_MAN_BERRY + 1
+#define NUM_ROUTE_114_MAN_BERRIES_SKIPPED FIRST_ROUTE_114_MAN_BERRY - FIRST_BERRY_INDEX
 
 #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))