Document Sootopolis scripts

22 files changed, 656 insertions, 644 deletions

diff --git a/data/maps/SootopolisCity/map.json b/data/maps/SootopolisCity/map.json
index 183c3ce46..946206347 100644
--- a/data/maps/SootopolisCity/map.json
+++ b/data/maps/SootopolisCity/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E5E8D",
+      "script": "SootopolisCity_EventScript_CaveOfOriginExpert",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E5FE2",
+      "script": "SootopolisCity_EventScript_Woman2",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E5ED8",
+      "script": "SootopolisCity_EventScript_Kiri",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E608E",
+      "script": "SootopolisCity_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E60E3",
+      "script": "SootopolisCity_EventScript_Boy1",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6017",
+      "script": "SootopolisCity_EventScript_Man",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAN_1"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6166",
+      "script": "SootopolisCity_EventScript_Steven",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6038",
+      "script": "SootopolisCity_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -167,7 +167,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6411",
+      "script": "SootopolisCity_EventScript_Maniac",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -180,7 +180,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E63DB",
+      "script": "SootopolisCity_EventScript_Girl",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -193,7 +193,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6393",
+      "script": "SootopolisCity_EventScript_BlackBelt",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -206,7 +206,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E635D",
+      "script": "SootopolisCity_EventScript_Boy2",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS"
     },
     {
@@ -219,7 +219,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E64F2",
+      "script": "SootopolisCity_EventScript_Maxie",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE"
     },
     {
@@ -232,7 +232,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E651F",
+      "script": "SootopolisCity_EventScript_Archie",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE"
     },
     {
@@ -245,7 +245,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_EventScript_1E6446",
+      "script": "SootopolisCity_EventScript_Wallace",
       "flag": "FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE"
     }
   ],
@@ -350,7 +350,7 @@
       "y": 34,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SootopolisCity_EventScript_1E614B"
+      "script": "SootopolisCity_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -390,7 +390,7 @@
       "y": 37,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SootopolisCity_EventScript_1E6154"
+      "script": "SootopolisCity_EventScript_CitySign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc
index a7e8fc00f..a936929d8 100644
--- a/data/maps/SootopolisCity/scripts.inc
+++ b/data/maps/SootopolisCity/scripts.inc
@@ -1,21 +1,21 @@
 SootopolisCity_MapScripts:: @ 81E565C
-	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_MapScript1_1E5676
+	map_script MAP_SCRIPT_ON_LOAD, SootopolisCity_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_OnTransition
-	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_MapScript1_1E590B
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MapScript2_1E5914
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_MapScript2_1E58DB
+	map_script MAP_SCRIPT_ON_RESUME, SootopolisCity_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, SootopolisCity_OnWarp
 	.byte 0
 
-SootopolisCity_MapScript1_1E5676: @ 81E5676
-	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E56E5
-	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_1E5692
-	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E5693
+SootopolisCity_OnLoad: @ 81E5676
+	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_LockGymDoor
+	goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_LegendariesNotArrived
+	call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_LockHouseDoors
 	end
 
-SootopolisCity_EventScript_1E5692:: @ 81E5692
+SootopolisCity_EventScript_LegendariesNotArrived:: @ 81E5692
 	end
 
-SootopolisCity_EventScript_1E5693:: @ 81E5693
+SootopolisCity_EventScript_LockHouseDoors:: @ 81E5693
 	setmetatile 9, 6, METATILE_Sootopolis_Door_Closed, 1
 	setmetatile 9, 17, METATILE_Sootopolis_Door_Closed, 1
 	setmetatile 9, 26, METATILE_Sootopolis_Door_Closed, 1
@@ -27,45 +27,45 @@ SootopolisCity_EventScript_1E5693:: @ 81E5693
 	setmetatile 51, 36, METATILE_Sootopolis_Door_Closed, 1
 	return
 
-SootopolisCity_EventScript_1E56E5:: @ 81E56E5
+SootopolisCity_EventScript_LockGymDoor:: @ 81E56E5
 	setmetatile 31, 32, METATILE_Sootopolis_GymDoor_Closed, 1
 	return
 
 SootopolisCity_OnTransition: @ 81E56EF
 	setflag FLAG_VISITED_SOOTOPOLIS_CITY
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E5781
+	call_if_eq SootopolisCity_EventScript_HideMapNamePopup
 	compare VAR_SKY_PILLAR_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E5781
-	call SootopolisCity_EventScript_1E5805
-	call SootopolisCity_EventScript_1E57B2
+	call_if_eq SootopolisCity_EventScript_HideMapNamePopup
+	call SootopolisCity_EventScript_SetWeather
+	call SootopolisCity_EventScript_SetLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	call_if_eq SootopolisCity_EventScript_1E5785
+	call_if_eq SootopolisCity_EventScript_SetBattleSpectators
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	call_if_eq SootopolisCity_EventScript_1E5842
+	call_if_eq SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	call_if_eq SootopolisCity_EventScript_1E5842
+	call_if_eq SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	call_if_eq SootopolisCity_EventScript_1E585B
+	call_if_eq SootopolisCity_EventScript_SetExitCaveOfOriginObjPos
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	call_if_eq SootopolisCity_EventScript_1E5871
+	call_if_eq SootopolisCity_EventScript_SetOutsideGymObjPos
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	call_if_eq SootopolisCity_EventScript_1E58D3
+	call_if_eq SootopolisCity_EventScript_SetExpertBlockCaveEntrance
 	end
 
-SootopolisCity_EventScript_1E5781:: @ 81E5781
+SootopolisCity_EventScript_HideMapNamePopup:: @ 81E5781
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
-SootopolisCity_EventScript_1E5785:: @ 81E5785
+SootopolisCity_EventScript_SetBattleSpectators:: @ 81E5785
 	setobjectxyperm 3, 13, 48
 	setobjectxyperm 5, 46, 32
 	setobjectxyperm 4, 48, 41
@@ -76,140 +76,141 @@ SootopolisCity_EventScript_1E5785:: @ 81E5785
 	setobjectmovementtype 8, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-SootopolisCity_EventScript_1E57B2:: @ 81E57B2
+SootopolisCity_EventScript_SetLayout:: @ 81E57B2
 	compare VAR_SOOTOPOLIS_CITY_STATE, 0
-	goto_if_eq SootopolisCity_EventScript_1E5800
+	goto_if_eq SootopolisCity_EventScript_SetNormalLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E5800
+	goto_if_ge SootopolisCity_EventScript_SetNormalLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_eq SootopolisCity_EventScript_1E5801
+	goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	goto_if_eq SootopolisCity_EventScript_1E5801
+	goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	goto_if_eq SootopolisCity_EventScript_1E5801
+	goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	goto_if_eq SootopolisCity_EventScript_1E5801
+	goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
 	compare VAR_SKY_PILLAR_STATE, 1
-	goto_if_le SootopolisCity_EventScript_1E5801
+	goto_if_le SootopolisCity_EventScript_SetLegendariesLayout
 	return
 
-SootopolisCity_EventScript_1E5800:: @ 81E5800
+SootopolisCity_EventScript_SetNormalLayout:: @ 81E5800
 	return
 
-SootopolisCity_EventScript_1E5801:: @ 81E5801
+SootopolisCity_EventScript_SetLegendariesLayout:: @ 81E5801
 	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_LEGENDS_BATTLE
 	return
 
-SootopolisCity_EventScript_1E5805:: @ 81E5805
+SootopolisCity_EventScript_SetWeather:: @ 81E5805
 	compare VAR_SOOTOPOLIS_CITY_STATE, 0
-	goto_if_eq SootopolisCity_EventScript_1E583D
+	goto_if_eq SootopolisCity_EventScript_SetNormalWeather
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E583D
+	goto_if_ge SootopolisCity_EventScript_SetNormalWeather
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_eq SootopolisCity_EventScript_1E583E
+	goto_if_eq SootopolisCity_EventScript_SetHeavyRain
 	compare VAR_SKY_PILLAR_STATE, 1
-	goto_if_eq SootopolisCity_EventScript_1E583E
+	goto_if_eq SootopolisCity_EventScript_SetHeavyRain
 	compare VAR_SKY_PILLAR_STATE, 1
 	goto_if_le Common_EventScript_SetAlternatingWeather
 	return
 
-SootopolisCity_EventScript_1E583D:: @ 81E583D
+SootopolisCity_EventScript_SetNormalWeather:: @ 81E583D
 	return
 
-SootopolisCity_EventScript_1E583E:: @ 81E583E
+SootopolisCity_EventScript_SetHeavyRain:: @ 81E583E
 	setweather WEATHER_RAIN_HEAVY
 	return
 
-SootopolisCity_EventScript_1E5842:: @ 81E5842
-	goto_if_set FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E584C
+SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos:: @ 81E5842
+	goto_if_set FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_SetEnterCaveOfOriginObjPos
 	return
 
-SootopolisCity_EventScript_1E584C:: @ 81E584C
-	setobjectxyperm 1, 30, 18
-	setobjectxyperm 7, 32, 18
+SootopolisCity_EventScript_SetEnterCaveOfOriginObjPos:: @ 81E584C
+	setobjectxyperm 1, 30, 18   @ Expert
+	setobjectxyperm 7, 32, 18   @ Steven
 	return
 
-SootopolisCity_EventScript_1E585B:: @ 81E585B
-	setobjectxyperm 1, 30, 18
-	setobjectxyperm 18, 31, 18
-	setobjectxyperm 7, 32, 18
+SootopolisCity_EventScript_SetExitCaveOfOriginObjPos:: @ 81E585B
+	setobjectxyperm 1, 30, 18   @ Expert
+	setobjectxyperm 18, 31, 18  @ Wallace
+	setobjectxyperm 7, 32, 18   @ Steven
 	end
 
-SootopolisCity_EventScript_1E5871:: @ 81E5871
-	setobjectxyperm 1, 31, 18
-	setobjectxyperm 7, 29, 33
-	setobjectxyperm 16, 33, 35
-	setobjectxyperm 17, 34, 35
+SootopolisCity_EventScript_SetOutsideGymObjPos:: @ 81E5871
+	setobjectxyperm 1, 31, 18   @ Expert
+	setobjectxyperm 7, 29, 33   @ Steven
+	setobjectxyperm 16, 33, 35  @ Maxie
+	setobjectxyperm 17, 34, 35  @ Archie
 	compare VAR_SOOTOPOLIS_WALLACE_STATE, 0
-	call_if_eq SootopolisCity_EventScript_1E58AF
+	call_if_eq SootopolisCity_EventScript_SetWallaceMiddle
 	compare VAR_SOOTOPOLIS_WALLACE_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E58BB
+	call_if_eq SootopolisCity_EventScript_SetWallaceRight
 	compare VAR_SOOTOPOLIS_WALLACE_STATE, 2
-	call_if_eq SootopolisCity_EventScript_1E58C7
+	call_if_eq SootopolisCity_EventScript_SetWallaceLeft
 	return
 
-SootopolisCity_EventScript_1E58AF:: @ 81E58AF
+SootopolisCity_EventScript_SetWallaceMiddle:: @ 81E58AF
 	setobjectxyperm 18, 31, 33
 	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_1E58BB:: @ 81E58BB
+SootopolisCity_EventScript_SetWallaceRight:: @ 81E58BB
 	setobjectxyperm 18, 32, 33
 	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_1E58C7:: @ 81E58C7
+SootopolisCity_EventScript_SetWallaceLeft:: @ 81E58C7
 	setobjectxyperm 18, 30, 33
 	setobjectmovementtype 18, MOVEMENT_TYPE_FACE_DOWN
 	return
 
-SootopolisCity_EventScript_1E58D3:: @ 81E58D3
-	setobjectxyperm 1, 31, 18
+SootopolisCity_EventScript_SetExpertBlockCaveEntrance:: @ 81E58D3
+	setobjectxyperm 1, 31, 18   @ Expert
 	return
 
-SootopolisCity_MapScript2_1E58DB: @ 81E58DB
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_1E58E5
+SootopolisCity_OnWarp: @ 81E58DB
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_PlayerFaceLegendaries
 	.2byte 0
 
-SootopolisCity_EventScript_1E58E5:: @ 81E58E5
+SootopolisCity_EventScript_PlayerFaceLegendaries:: @ 81E58E5
 	compare VAR_SKY_PILLAR_STATE, 1
-	call_if_eq SootopolisCity_EventScript_1E58FC
+	call_if_eq SootopolisCity_EventScript_PlayerFaceLegendaries1
 	compare VAR_SKY_PILLAR_STATE, 2
-	call_if_eq SootopolisCity_EventScript_1E5901
+	call_if_eq SootopolisCity_EventScript_PlayerFaceLegendaries2
 	end
 
-SootopolisCity_EventScript_1E58FC:: @ 81E58FC
+SootopolisCity_EventScript_PlayerFaceLegendaries1:: @ 81E58FC
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	return
 
-SootopolisCity_EventScript_1E5901:: @ 81E5901
+SootopolisCity_EventScript_PlayerFaceLegendaries2:: @ 81E5901
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_NORTH
 	setvar VAR_SKY_PILLAR_STATE, 3
 	return
 
-SootopolisCity_MapScript1_1E590B: @ 81E590B
+SootopolisCity_OnResume: @ 81E590B
 	setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6
 	end
 
-SootopolisCity_MapScript2_1E5914: @ 81E5914
-	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_1E5926
-	map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_1E5BFE
+SootopolisCity_OnFrame: @ 81E5914
+	map_script_2 VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_StartLegendariesScene
+	map_script_2 VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_StartRayquazaScene
 	.2byte 0
 
-SootopolisCity_EventScript_1E5926:: @ 81E5926
+@ If not at PokeCenter, assumed to have arrived via Dive
+SootopolisCity_EventScript_StartLegendariesScene:: @ 81E5926
 	lockall
 	special StorePlayerCoordsInVars
 	compare VAR_0x8004, 43
-	goto_if_ne SootopolisCity_EventScript_1E5A82
+	goto_if_ne SootopolisCity_EventScript_LegendariesSceneFromDive
 	compare VAR_0x8005, 32
-	goto_if_ne SootopolisCity_EventScript_1E5A82
-	goto SootopolisCity_EventScript_1E5946
+	goto_if_ne SootopolisCity_EventScript_LegendariesSceneFromDive
+	goto SootopolisCity_EventScript_LegendariesSceneFromPokeCenter
 	end
 
-SootopolisCity_EventScript_1E5946:: @ 81E5946
+SootopolisCity_EventScript_LegendariesSceneFromPokeCenter:: @ 81E5946
 	delay 60
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
@@ -225,8 +226,8 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	delay 60
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
+	applymovement 10, SootopolisCity_Movement_KyogreAttack
+	applymovement 9, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -234,13 +235,13 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_GROUDON, 2
-	applymovement 10, SootopolisCity_Movement_1E5BC2
-	applymovement 9, SootopolisCity_Movement_1E5BDD
+	applymovement 10, SootopolisCity_Movement_GroudonAttack
+	applymovement 9, SootopolisCity_Movement_KyogreDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -248,13 +249,13 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
+	applymovement 10, SootopolisCity_Movement_KyogreAttack
+	applymovement 9, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -262,13 +263,13 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	special SpawnCameraObject
-	applymovement 10, SootopolisCity_Movement_1E5BD6
-	applymovement 9, SootopolisCity_Movement_1E5BF7
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A75
+	applymovement 10, SootopolisCity_Movement_KyogreIdle
+	applymovement 9, SootopolisCity_Movement_GroudonIdle
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToPokeCenter
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 2
@@ -276,7 +277,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	releaseall
 	end
 
-SootopolisCity_Movement_1E5A68: @ 81E5A68
+SootopolisCity_Movement_PanToActionFromPokeCenter: @ 81E5A68
 	walk_slow_diag_southwest
 	walk_slow_diag_southwest
 	walk_slow_diag_southwest
@@ -291,7 +292,7 @@ SootopolisCity_Movement_1E5A68: @ 81E5A68
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_Movement_1E5A75: @ 81E5A75
+SootopolisCity_Movement_PanBackToPokeCenter: @ 81E5A75
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
@@ -306,10 +307,10 @@ SootopolisCity_Movement_1E5A75: @ 81E5A75
 	walk_slow_diag_northeast
 	step_end
 
-SootopolisCity_EventScript_1E5A82:: @ 81E5A82
+SootopolisCity_EventScript_LegendariesSceneFromDive:: @ 81E5A82
 	delay 60
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
@@ -325,8 +326,8 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	delay 60
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
+	applymovement 10, SootopolisCity_Movement_KyogreAttack
+	applymovement 9, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -334,13 +335,13 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_GROUDON, 2
-	applymovement 10, SootopolisCity_Movement_1E5BC2
-	applymovement 9, SootopolisCity_Movement_1E5BDD
+	applymovement 10, SootopolisCity_Movement_GroudonAttack
+	applymovement 9, SootopolisCity_Movement_KyogreDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -348,13 +349,13 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_KYOGRE, 2
-	applymovement 10, SootopolisCity_Movement_1E5BB8
-	applymovement 9, SootopolisCity_Movement_1E5BE5
+	applymovement 10, SootopolisCity_Movement_KyogreAttack
+	applymovement 9, SootopolisCity_Movement_GroudonDefend
 	waitmovement 0
 	setvar VAR_0x8004, 1  @ vertical pan
 	setvar VAR_0x8005, 1  @ horizontal pan
@@ -362,13 +363,13 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	setvar VAR_0x8007, 5  @ shake delay
 	special ShakeCamera
 	waitstate
-	applymovement 10, SootopolisCity_Movement_1E5BCF
-	applymovement 9, SootopolisCity_Movement_1E5BF0
+	applymovement 10, SootopolisCity_Movement_KyogreMoveBack
+	applymovement 9, SootopolisCity_Movement_GroudonMoveBack
 	waitmovement 0
 	special SpawnCameraObject
-	applymovement 10, SootopolisCity_Movement_1E5BD6
-	applymovement 9, SootopolisCity_Movement_1E5BF7
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BAE
+	applymovement 10, SootopolisCity_Movement_KyogreIdle
+	applymovement 9, SootopolisCity_Movement_GroudonIdle
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanBackToDive
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_SOOTOPOLIS_CITY_STATE, 2
@@ -376,7 +377,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	releaseall
 	end
 
-SootopolisCity_Movement_1E5BA4: @ 81E5BA4
+SootopolisCity_Movement_PanToActionFromDive: @ 81E5BA4
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_up
@@ -388,7 +389,7 @@ SootopolisCity_Movement_1E5BA4: @ 81E5BA4
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E5BAE: @ 81E5BAE
+SootopolisCity_Movement_PanBackToDive: @ 81E5BAE
 	walk_down
 	walk_down
 	walk_down
@@ -400,7 +401,7 @@ SootopolisCity_Movement_1E5BAE: @ 81E5BAE
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_Movement_1E5BB8: @ 81E5BB8
+SootopolisCity_Movement_KyogreAttack: @ 81E5BB8
 	walk_in_place_slow_left
 	walk_in_place_slow_left
 	walk_in_place_slow_left
@@ -412,7 +413,7 @@ SootopolisCity_Movement_1E5BB8: @ 81E5BB8
 	clear_affine_anim
 	step_end
 
-SootopolisCity_Movement_1E5BC2: @ 81E5BC2
+SootopolisCity_Movement_GroudonAttack: @ 81E5BC2
 	delay_16
 	delay_16
 	delay_16
@@ -427,7 +428,7 @@ SootopolisCity_Movement_1E5BC2: @ 81E5BC2
 	clear_affine_anim
 	step_end
 
-SootopolisCity_Movement_1E5BCF: @ 81E5BCF
+SootopolisCity_Movement_KyogreMoveBack: @ 81E5BCF
 	lock_facing_direction
 	walk_right
 	delay_16
@@ -436,7 +437,7 @@ SootopolisCity_Movement_1E5BCF: @ 81E5BCF
 	unlock_facing_direction
 	step_end
 
-SootopolisCity_Movement_1E5BD6: @ 81E5BD6
+SootopolisCity_Movement_KyogreIdle: @ 81E5BD6
 	walk_in_place_slow_left
 	walk_in_place_slow_left
 	walk_in_place_slow_left
@@ -445,7 +446,7 @@ SootopolisCity_Movement_1E5BD6: @ 81E5BD6
 	walk_in_place_slow_left
 	step_end
 
-SootopolisCity_Movement_1E5BDD: @ 81E5BDD
+SootopolisCity_Movement_KyogreDefend: @ 81E5BDD
 	walk_in_place_slow_right
 	walk_in_place_slow_right
 	walk_in_place_slow_right
@@ -455,7 +456,7 @@ SootopolisCity_Movement_1E5BDD: @ 81E5BDD
 	walk_fast_right
 	step_end
 
-SootopolisCity_Movement_1E5BE5: @ 81E5BE5
+SootopolisCity_Movement_GroudonDefend: @ 81E5BE5
 	delay_16
 	delay_16
 	delay_16
@@ -468,7 +469,7 @@ SootopolisCity_Movement_1E5BE5: @ 81E5BE5
 	walk_fast_right
 	step_end
 
-SootopolisCity_Movement_1E5BF0: @ 81E5BF0
+SootopolisCity_Movement_GroudonMoveBack: @ 81E5BF0
 	lock_facing_direction
 	walk_left
 	delay_16
@@ -477,7 +478,7 @@ SootopolisCity_Movement_1E5BF0: @ 81E5BF0
 	unlock_facing_direction
 	step_end
 
-SootopolisCity_Movement_1E5BF7: @ 81E5BF7
+SootopolisCity_Movement_GroudonIdle: @ 81E5BF7
 	walk_in_place_slow_right
 	walk_in_place_slow_right
 	walk_in_place_slow_right
@@ -486,25 +487,26 @@ SootopolisCity_Movement_1E5BF7: @ 81E5BF7
 	walk_in_place_slow_right
 	step_end
 
-SootopolisCity_EventScript_1E5BFE:: @ 81E5BFE
+@ If not at PokeCenter, assumed to have arrived via Dive
+SootopolisCity_EventScript_StartRayquazaScene:: @ 81E5BFE
 	lockall
 	special StorePlayerCoordsInVars
 	compare VAR_0x8004, 43
-	goto_if_ne SootopolisCity_EventScript_1E5CCE
+	goto_if_ne SootopolisCity_EventScript_RayquazaSceneFromDive
 	compare VAR_0x8005, 32
-	goto_if_ne SootopolisCity_EventScript_1E5CCE
-	goto SootopolisCity_EventScript_1E5C1E
+	goto_if_ne SootopolisCity_EventScript_RayquazaSceneFromDive
+	goto SootopolisCity_EventScript_RayquazaSceneFromPokeCenter
 	end
 
-SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
+SootopolisCity_EventScript_RayquazaSceneFromPokeCenter:: @ 81E5C1E
 	delay 60
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5A68
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromPokeCenter
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
 	fadescreenspeed 1, 8
-	call SootopolisCity_EventScript_1E5D82
+	call SootopolisCity_EventScript_SetRoughWater
 	removeobject 9
 	removeobject 10
 	addobject 11
@@ -513,7 +515,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	waitstate
 	playse SE_T_KAMI
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_RAYQUAZA, 2
@@ -534,7 +536,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	waitmoncry
 	setweather WEATHER_NONE
 	doweather
-	applymovement 11, SootopolisCity_Movement_1E5E5B
+	applymovement 11, SootopolisCity_Movement_RayquazaFlyOff
 	waitmovement 0
 	removeobject 11
 	special WaitWeather
@@ -549,15 +551,15 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	waitstate
 	end
 
-SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
+SootopolisCity_EventScript_RayquazaSceneFromDive:: @ 81E5CCE
 	delay 60
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5BA4
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanToActionFromDive
 	waitmovement 0
 	special RemoveCameraObject
 	delay 60
 	fadescreenspeed 1, 8
-	call SootopolisCity_EventScript_1E5D82
+	call SootopolisCity_EventScript_SetRoughWater
 	removeobject 9
 	removeobject 10
 	addobject 11
@@ -565,8 +567,8 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	special Script_DoRayquazaScene
 	waitstate
 	special SpawnCameraObject
-	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_1E5E63
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E5E68
+	applymovement EVENT_OBJ_ID_CAMERA, SootopolisCity_Movement_PanUp
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerApproachLegendaries
 	waitmovement 0
 	waitse
 	playmoncry SPECIES_RAYQUAZA, 2
@@ -587,7 +589,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	waitmoncry
 	setweather WEATHER_NONE
 	doweather
-	applymovement 11, SootopolisCity_Movement_1E5E5B
+	applymovement 11, SootopolisCity_Movement_RayquazaFlyOff
 	waitmovement 0
 	removeobject 11
 	special WaitWeather
@@ -602,7 +604,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	waitstate
 	end
 
-SootopolisCity_EventScript_1E5D82:: @ 81E5D82
+SootopolisCity_EventScript_SetRoughWater:: @ 81E5D82
 	setmetatile 27, 43, METATILE_Sootopolis_RoughWater, 0
 	setmetatile 28, 43, METATILE_Sootopolis_RoughWater, 0
 	setmetatile 29, 43, METATILE_Sootopolis_RoughWater, 0
@@ -629,7 +631,7 @@ SootopolisCity_EventScript_1E5D82:: @ 81E5D82
 	setmetatile 35, 45, METATILE_Sootopolis_RoughWater, 0
 	return
 
-SootopolisCity_Movement_1E5E5B: @ 81E5E5B
+SootopolisCity_Movement_RayquazaFlyOff: @ 81E5E5B
 	walk_fast_up
 	walk_fastest_up
 	walk_fastest_up
@@ -639,28 +641,30 @@ SootopolisCity_Movement_1E5E5B: @ 81E5E5B
 	walk_fastest_up
 	step_end
 
-SootopolisCity_Movement_1E5E63: @ 81E5E63
+SootopolisCity_Movement_PanUp: @ 81E5E63
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E5E68: @ 81E5E68
+SootopolisCity_Movement_PlayerApproachLegendaries: @ 81E5E68
 	walk_up
 	walk_up
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E5E6D: @ 81E5E6D
+@ Unused
+SootopolisCity_Movement_PlayerApproachLegendariesDown: @ 81E5E6D
 	walk_down
 	walk_down
 	walk_down
 	walk_down
 	step_end
 
-SootopolisCity_Movement_1E5E72: @ 81E5E72
+@ Unused
+SootopolisCity_Movement_UnusedPanUp: @ 81E5E72
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
 	walk_slow_diag_northeast
@@ -675,7 +679,8 @@ SootopolisCity_Movement_1E5E72: @ 81E5E72
 	walk_right
 	step_end
 
-SootopolisCity_Movement_1E5E7F: @ 81E5E7F
+@ Unused
+SootopolisCity_Movement_UnusedPanBack: @ 81E5E7F
 	walk_down
 	walk_down
 	walk_down
@@ -691,311 +696,312 @@ SootopolisCity_Movement_1E5E7F: @ 81E5E7F
 	walk_slow_diag_southwest
 	step_end
 
-SootopolisCity_EventScript_1E5E8D:: @ 81E5E8D
+SootopolisCity_EventScript_CaveOfOriginExpert:: @ 81E5E8D
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E5EC4
+	goto_if_ge SootopolisCity_EventScript_ExpertPostLegendaries
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E5ECE
+	goto_if_eq SootopolisCity_EventScript_ExpertLegendaries
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	goto_if_ge SootopolisCity_EventScript_1E5EBA
-	msgbox SootopolisCity_Text_1E6D77, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_EventScript_ExpertLeadToCave
+	msgbox SootopolisCity_Text_CaveOfOriginPleaseLeave, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5EBA:: @ 81E5EBA
-	msgbox SootopolisCity_Text_1E6DFE, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ExpertLeadToCave:: @ 81E5EBA
+	msgbox SootopolisCity_Text_LeadSuperiorTrainerToCave, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5EC4:: @ 81E5EC4
-	msgbox SootopolisCity_Text_1E6F38, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ExpertPostLegendaries:: @ 81E5EC4
+	msgbox SootopolisCity_Text_CaveOfOriginSleepsToo, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5ECE:: @ 81E5ECE
-	msgbox SootopolisCity_Text_1E6ED4, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ExpertLegendaries:: @ 81E5ECE
+	msgbox SootopolisCity_Text_AwakenedPokemonClash, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5ED8:: @ 81E5ED8
+SootopolisCity_EventScript_Kiri:: @ 81E5ED8
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_le SootopolisCity_EventScript_1E5F1B
+	goto_if_le SootopolisCity_EventScript_KiriGiveBerry
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E5F1B
+	goto_if_ge SootopolisCity_EventScript_KiriGiveBerry
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E5F10
-	msgbox SootopolisCity_Text_1E6BFF, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_KiriRayquaza
+	msgbox SootopolisCity_Text_BigPokemonFighting, MSGBOX_DEFAULT
 	closemessage
 	applymovement 3, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SootopolisCity_EventScript_1E5F10:: @ 81E5F10
-	msgbox SootopolisCity_Text_1E6C53, MSGBOX_DEFAULT
+SootopolisCity_EventScript_KiriRayquaza:: @ 81E5F10
+	msgbox SootopolisCity_Text_PrettyMonCameFromSky, MSGBOX_DEFAULT
 	closemessage
 	release
 	end
 
-SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B
+@ Gives 2 berries daily. First ranges from FIRST_KIRI_BERRY to LAST_KIRI_BERRY, second is always Figy or Iapapa
+SootopolisCity_EventScript_KiriGiveBerry:: @ 81E5F1B
 	dotimebasedevents
 	special GetPlayerBigGuyGirlString
-	goto_if_set FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY, SootopolisCity_EventScript_1E5FBB
-	msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT
-	random 10
-	addvar VAR_RESULT, 20
+	goto_if_set FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY, SootopolisCity_EventScript_KiriReceivedBerry
+	msgbox SootopolisCity_Text_NameIsKiriHaveOneOfThese, MSGBOX_DEFAULT
+	random NUM_KIRI_BERRIES
+	addvar VAR_RESULT, NUM_KIRI_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_SOOTOPOLIS_RECEIVED_BERRY
-	msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_GiveYouThisBerryToo, MSGBOX_DEFAULT
 	random 2
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_EventScript_1E5F79
+	goto_if_eq SootopolisCity_EventScript_GiveFigyBerry
 	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_EventScript_1E5F9A
+	goto_if_eq SootopolisCity_EventScript_GiveIapapaBerry
 	end
 
-SootopolisCity_EventScript_1E5F79:: @ 81E5F79
+SootopolisCity_EventScript_GiveFigyBerry:: @ 81E5F79
 	giveitem_std ITEM_FIGY_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5F9A:: @ 81E5F9A
+SootopolisCity_EventScript_GiveIapapaBerry:: @ 81E5F9A
 	giveitem_std ITEM_IAPAPA_BERRY
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox SootopolisCity_Text_2A7CB7, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5FBB:: @ 81E5FBB
-	msgbox SootopolisCity_Text_2A7CEC, MSGBOX_YESNO
+SootopolisCity_EventScript_KiriReceivedBerry:: @ 81E5FBB
+	msgbox SootopolisCity_Text_LikeSeasonBornIn, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq SootopolisCity_EventScript_1E5FD8
-	msgbox SootopolisCity_Text_2A7DD2, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_KiriLikeSeasonBornIn
+	msgbox SootopolisCity_Text_OhDoesntMatter, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5FD8:: @ 81E5FD8
-	msgbox SootopolisCity_Text_2A7D80, MSGBOX_DEFAULT
+SootopolisCity_EventScript_KiriLikeSeasonBornIn:: @ 81E5FD8
+	msgbox SootopolisCity_Text_ThenILoveAutumn, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E5FE2:: @ 81E5FE2
+SootopolisCity_EventScript_Woman2:: @ 81E5FE2
 	lockall
 	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E600D
-	msgbox SootopolisCity_Text_1E71A1, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_Woman2Rayquaza
+	msgbox SootopolisCity_Text_WeatherWentWild, MSGBOX_DEFAULT
 	closemessage
 	applymovement 2, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E600D:: @ 81E600D
-	msgbox SootopolisCity_Text_1E728C, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Woman2Rayquaza:: @ 81E600D
+	msgbox SootopolisCity_Text_YouBroughtFlyingMon, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6017:: @ 81E6017
+SootopolisCity_EventScript_Man:: @ 81E6017
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E602E
-	msgbox SootopolisCity_Text_1E6CCA, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_EventScript_ManPostLegendaries
+	msgbox SootopolisCity_Text_NoOrdinaryTourist, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E602E:: @ 81E602E
-	msgbox SootopolisCity_Text_1E6D57, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ManPostLegendaries:: @ 81E602E
+	msgbox SootopolisCity_Text_CityRegainedCalm, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6038:: @ 81E6038
+SootopolisCity_EventScript_Woman1:: @ 81E6038
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E607A
+	goto_if_ge SootopolisCity_EventScript_Woman1PostLegendaries
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6084
+	goto_if_eq SootopolisCity_EventScript_Woman1Rayquaza
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	goto_if_ge SootopolisCity_EventScript_1E6065
-	msgbox SootopolisCity_Text_1E6F90, MSGBOX_DEFAULT
+	goto_if_ge SootopolisCity_EventScript_Woman1Legendaries
+	msgbox SootopolisCity_Text_SootopolisSkyBeautiful, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6065:: @ 81E6065
-	msgbox SootopolisCity_Text_1E7078, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Woman1Legendaries:: @ 81E6065
+	msgbox SootopolisCity_Text_GiganticPokemonFight, MSGBOX_DEFAULT
 	closemessage
 	applymovement 8, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SootopolisCity_EventScript_1E607A:: @ 81E607A
-	msgbox SootopolisCity_Text_1E710B, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Woman1PostLegendaries:: @ 81E607A
+	msgbox SootopolisCity_Text_NightSkyFavoriteScenery, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6084:: @ 81E6084
-	msgbox SootopolisCity_Text_1E70D4, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Woman1Rayquaza:: @ 81E6084
+	msgbox SootopolisCity_Text_FearedWorstWhenPokemonFlewDown, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E608E:: @ 81E608E
+SootopolisCity_EventScript_NinjaBoy:: @ 81E608E
 	lockall
 	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E60D9
+	goto_if_eq SootopolisCity_EventScript_NinjaBoyRayquaza
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E60CF
+	goto_if_ge SootopolisCity_EventScript_NinjaBoyNormal
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_le SootopolisCity_EventScript_1E60CF
-	msgbox SootopolisCity_Text_1E690B, MSGBOX_DEFAULT
+	goto_if_le SootopolisCity_EventScript_NinjaBoyNormal
+	msgbox SootopolisCity_Text_ThisIsWicked, MSGBOX_DEFAULT
 	closemessage
 	applymovement 4, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SootopolisCity_EventScript_1E60CF:: @ 81E60CF
-	msgbox SootopolisCity_Text_1E68A1, MSGBOX_DEFAULT
+SootopolisCity_EventScript_NinjaBoyNormal:: @ 81E60CF
+	msgbox SootopolisCity_Text_WonderWhatWorldIsLike, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E60D9:: @ 81E60D9
-	msgbox SootopolisCity_Text_1E6920, MSGBOX_DEFAULT
+SootopolisCity_EventScript_NinjaBoyRayquaza:: @ 81E60D9
+	msgbox SootopolisCity_Text_ThatWasWicked, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E60E3:: @ 81E60E3
+SootopolisCity_EventScript_Boy1:: @ 81E60E3
 	lockall
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E612D
-	goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_1E6137
+	goto_if_eq SootopolisCity_EventScript_Boy1Rayquaza
+	goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_Boy1GameClear
 	compare VAR_SOOTOPOLIS_CITY_STATE, 6
-	goto_if_ge SootopolisCity_EventScript_1E6141
+	goto_if_ge SootopolisCity_EventScript_Boy1Normal
 	compare VAR_SOOTOPOLIS_CITY_STATE, 1
-	goto_if_le SootopolisCity_EventScript_1E6141
-	msgbox SootopolisCity_Text_1E6692, MSGBOX_DEFAULT
+	goto_if_le SootopolisCity_EventScript_Boy1Normal
+	msgbox SootopolisCity_Text_GiantPokemonSuddenlyAppeared, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SootopolisCity_EventScript_1E612D:: @ 81E612D
-	msgbox SootopolisCity_Text_1E6750, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Boy1Rayquaza:: @ 81E612D
+	msgbox SootopolisCity_Text_WhatIsThatGreenPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6137:: @ 81E6137
-	msgbox SootopolisCity_Text_1E677F, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Boy1GameClear:: @ 81E6137
+	msgbox SootopolisCity_Text_WhereDidLegendariesGo, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E6141:: @ 81E6141
-	msgbox SootopolisCity_Text_1E6618, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Boy1Normal:: @ 81E6141
+	msgbox SootopolisCity_Text_PhysicallyFitLivingHere, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E614B:: @ 81E614B
-	msgbox SootopolisCity_Text_1E656F, MSGBOX_SIGN
+SootopolisCity_EventScript_GymSign:: @ 81E614B
+	msgbox SootopolisCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-SootopolisCity_EventScript_1E6154:: @ 81E6154
-	msgbox SootopolisCity_Text_1E65C8, MSGBOX_SIGN
+SootopolisCity_EventScript_CitySign:: @ 81E6154
+	msgbox SootopolisCity_Text_CitySign, MSGBOX_SIGN
 	end
 
 EventScript_ClosedSootopolisDoor:: @ 81E615D
-	msgbox SootopolisCity_Text_1E6604, MSGBOX_SIGN
+	msgbox SootopolisCity_Text_DoorIsClosed, MSGBOX_SIGN
 	end
 
-SootopolisCity_EventScript_1E6166:: @ 81E6166
+SootopolisCity_EventScript_Steven:: @ 81E6166
 	lockall
 	applymovement 7, Common_Movement_FacePlayer
 	waitmovement 0
-	call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC
+	call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin
 	compare VAR_SOOTOPOLIS_CITY_STATE, 2
-	goto_if_eq SootopolisCity_EventScript_1E61AE
+	goto_if_eq SootopolisCity_EventScript_StevenHelpWallace
 	compare VAR_SOOTOPOLIS_CITY_STATE, 3
-	goto_if_eq SootopolisCity_EventScript_1E61C2
+	goto_if_eq SootopolisCity_EventScript_StevenHelpedWallace
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	goto_if_eq SootopolisCity_EventScript_1E61C2
-	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E61B8
-	msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_StevenHelpedWallace
+	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_StevenMaxieArchieLeft
+	msgbox SootopolisCity_Text_SoThatsRayquaza, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E61AE:: @ 81E61AE
-	msgbox SootopolisCity_Text_1E7866, MSGBOX_DEFAULT
+SootopolisCity_EventScript_StevenHelpWallace:: @ 81E61AE
+	msgbox SootopolisCity_Text_KnowWhatsNeededToHelpHim, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E61B8:: @ 81E61B8
-	msgbox SootopolisCity_Text_1E794B, MSGBOX_DEFAULT
+SootopolisCity_EventScript_StevenMaxieArchieLeft:: @ 81E61B8
+	msgbox SootopolisCity_Text_MaxieArchieLeft, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E61C2:: @ 81E61C2
-	msgbox SootopolisCity_Text_1E789A, MSGBOX_DEFAULT
+SootopolisCity_EventScript_StevenHelpedWallace:: @ 81E61C2
+	msgbox SootopolisCity_Text_NeverBeenToSkyPillar, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E61CC:: @ 81E61CC
-	msgbox SootopolisCity_Text_1E75CB, MSGBOX_DEFAULT
+SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin:: @ 81E61CC
+	msgbox SootopolisCity_Text_InvolvedWithCrisisComeWithMe, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_WEST
-	call_if_eq SootopolisCity_EventScript_1E6243
+	call_if_eq SootopolisCity_EventScript_StartWalkToCaveOfOriginWest
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq SootopolisCity_EventScript_1E6255
-	msgbox SootopolisCity_Text_1E7737, MSGBOX_DEFAULT
+	call_if_eq SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth
+	msgbox SootopolisCity_Text_DoesThisMakeYourFearPokemon, MSGBOX_DEFAULT
 	closemessage
-	applymovement 7, SootopolisCity_Movement_1E62D4
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E630E
+	applymovement 7, SootopolisCity_Movement_StevenWalkToCaveOfOrigin
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerWalkToCaveOfOrigin
 	waitmovement 0
 	delay 120
-	applymovement 1, SootopolisCity_Movement_1E6341
+	applymovement 1, SootopolisCity_Movement_ExpertMoveAside
 	waitmovement 0
-	applymovement 7, SootopolisCity_Movement_1E6344
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E634F
+	applymovement 7, SootopolisCity_Movement_StevenArriveCaveEntrance
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerArriveCaveEntrance
 	waitmovement 0
-	msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_HereWereAreHelpWallace, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E635A
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerEnterCaveOfOrigin
 	waitmovement 0
 	warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20
 	waitstate
 	end
 
-SootopolisCity_EventScript_1E6243:: @ 81E6243
-	applymovement 7, SootopolisCity_Movement_1E6267
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E628C
+SootopolisCity_EventScript_StartWalkToCaveOfOriginWest:: @ 81E6243
+	applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest
 	waitmovement 0
 	return
 
-SootopolisCity_EventScript_1E6255:: @ 81E6255
-	applymovement 7, SootopolisCity_Movement_1E6267
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E62B0
+SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth:: @ 81E6255
+	applymovement 7, SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth
 	waitmovement 0
 	return
 
-SootopolisCity_Movement_1E6267: @ 81E6267
+SootopolisCity_Movement_StevenStartWalkToCaveOfOrigin: @ 81E6267
 	walk_up
 	walk_up
 	walk_up
@@ -1034,7 +1040,7 @@ SootopolisCity_Movement_1E6267: @ 81E6267
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_Movement_1E628C: @ 81E628C
+SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginWest: @ 81E628C
 	walk_left
 	walk_up
 	walk_up
@@ -1072,7 +1078,7 @@ SootopolisCity_Movement_1E628C: @ 81E628C
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E62B0: @ 81E62B0
+SootopolisCity_Movement_PlayerStartWalkToCaveOfOriginNorth: @ 81E62B0
 	walk_up
 	walk_up
 	walk_up
@@ -1110,7 +1116,7 @@ SootopolisCity_Movement_1E62B0: @ 81E62B0
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E62D4: @ 81E62D4
+SootopolisCity_Movement_StevenWalkToCaveOfOrigin: @ 81E62D4
 	walk_up
 	walk_up
 	walk_right
@@ -1170,7 +1176,7 @@ SootopolisCity_Movement_1E62D4: @ 81E62D4
 	walk_up
 	step_end
 
-SootopolisCity_Movement_1E630E: @ 81E630E
+SootopolisCity_Movement_PlayerWalkToCaveOfOrigin: @ 81E630E
 	walk_up
 	walk_up
 	walk_up
@@ -1223,12 +1229,12 @@ SootopolisCity_Movement_1E630E: @ 81E630E
 	walk_right
 	step_end
 
-SootopolisCity_Movement_1E6341: @ 81E6341
+SootopolisCity_Movement_ExpertMoveAside: @ 81E6341
 	walk_slow_left
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_Movement_1E6344: @ 81E6344
+SootopolisCity_Movement_StevenArriveCaveEntrance: @ 81E6344
 	walk_down
 	walk_down
 	walk_left
@@ -1241,7 +1247,7 @@ SootopolisCity_Movement_1E6344: @ 81E6344
 	walk_in_place_fastest_left
 	step_end
 
-SootopolisCity_Movement_1E634F: @ 81E634F
+SootopolisCity_Movement_PlayerArriveCaveEntrance: @ 81E634F
 	delay_16
 	delay_16
 	delay_16
@@ -1254,182 +1260,182 @@ SootopolisCity_Movement_1E634F: @ 81E634F
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_Movement_1E635A: @ 81E635A
+SootopolisCity_Movement_PlayerEnterCaveOfOrigin: @ 81E635A
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_EventScript_1E635D:: @ 81E635D
+SootopolisCity_EventScript_Boy2:: @ 81E635D
 	lockall
 	applymovement 15, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6388
-	msgbox SootopolisCity_Text_1E67DC, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_Boy2Rayquaza
+	msgbox SootopolisCity_Text_TwoPokemonArentAngry, MSGBOX_DEFAULT
 	closemessage
 	applymovement 15, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6388:: @ 81E6388
-	msgbox SootopolisCity_Text_1E6853, MSGBOX_DEFAULT
+SootopolisCity_EventScript_Boy2Rayquaza:: @ 81E6388
+	msgbox SootopolisCity_Text_FlyingMonStoppedRampage, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6393:: @ 81E6393
+SootopolisCity_EventScript_BlackBelt:: @ 81E6393
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E63C7
-	msgbox SootopolisCity_Text_1E6936, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_BlackBeltRayquaza
+	msgbox SootopolisCity_Text_GoRedAndBlueMon, MSGBOX_DEFAULT
 	closemessage
 	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SootopolisCity_Text_1E696C, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_DoYouKnowMonNames, MSGBOX_DEFAULT
 	closemessage
 	applymovement 14, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E63C7:: @ 81E63C7
+SootopolisCity_EventScript_BlackBeltRayquaza:: @ 81E63C7
 	applymovement 14, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SootopolisCity_Text_1E69B8, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_GreenOneSettlesThings, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E63DB:: @ 81E63DB
+SootopolisCity_EventScript_Girl:: @ 81E63DB
 	lockall
 	applymovement 13, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6406
-	msgbox SootopolisCity_Text_1E6C7C, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_GirlRayquaza
+	msgbox SootopolisCity_Text_SootopolisWillBeWrecked, MSGBOX_DEFAULT
 	closemessage
 	applymovement 13, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6406:: @ 81E6406
-	msgbox SootopolisCity_Text_1E6CA6, MSGBOX_DEFAULT
+SootopolisCity_EventScript_GirlRayquaza:: @ 81E6406
+	msgbox SootopolisCity_Text_SootopolisDidntGetWrecked, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6411:: @ 81E6411
+SootopolisCity_EventScript_Maniac:: @ 81E6411
 	lockall
 	applymovement 12, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E643C
-	msgbox SootopolisCity_Text_1E6A50, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_ManiacRayquaza
+	msgbox SootopolisCity_Text_SeeingLegendWithOwnEyes, MSGBOX_DEFAULT
 	closemessage
 	applymovement 12, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E643C:: @ 81E643C
-	msgbox SootopolisCity_Text_1E6B2A, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ManiacRayquaza:: @ 81E643C
+	msgbox SootopolisCity_Text_SawLegendWithOwnEyes, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6446:: @ 81E6446
+SootopolisCity_EventScript_Wallace:: @ 81E6446
 	lock
 	faceplayer
 	compare VAR_SOOTOPOLIS_CITY_STATE, 4
-	goto_if_eq SootopolisCity_EventScript_1E64D8
-	goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_1E64E2
-	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E646F
-	msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_GoToSkyPillar
+	goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_GoToGym
+	goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_GiveWaterfall
+	msgbox SootopolisCity_Text_AquaMagmaDidntMeanHarm, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E646F:: @ 81E646F
-	msgbox SootopolisCity_Text_1E7ACF, MSGBOX_DEFAULT
+SootopolisCity_EventScript_GiveWaterfall:: @ 81E646F
+	msgbox SootopolisCity_Text_ThankYouForHelpAcceptThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM07
 	setflag FLAG_RECEIVED_HM07
-	msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT
+	msgbox SootopolisCity_Text_ExplainWaterfallGoToGym, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq SootopolisCity_EventScript_1E64B2
+	call_if_eq SootopolisCity_EventScript_WallaceMoveFromGym
 	compare VAR_FACING, DIR_EAST
-	call_if_eq SootopolisCity_EventScript_1E64B2
+	call_if_eq SootopolisCity_EventScript_WallaceMoveFromGym
 	compare VAR_FACING, DIR_WEST
-	call_if_eq SootopolisCity_EventScript_1E64C5
+	call_if_eq SootopolisCity_EventScript_WallaceMoveFromGymWest
 	release
 	end
 
-SootopolisCity_EventScript_1E64B2:: @ 81E64B2
-	applymovement 18, SootopolisCity_Movement_1E64EC
+SootopolisCity_EventScript_WallaceMoveFromGym:: @ 81E64B2
+	applymovement 18, SootopolisCity_Movement_WallaceMoveFromGym
 	waitmovement 0
 	copyobjectxytoperm 18
 	setvar VAR_SOOTOPOLIS_WALLACE_STATE, 1
 	return
 
-SootopolisCity_EventScript_1E64C5:: @ 81E64C5
-	applymovement 18, SootopolisCity_Movement_1E64EF
+SootopolisCity_EventScript_WallaceMoveFromGymWest:: @ 81E64C5
+	applymovement 18, SootopolisCity_Movement_WallaceMoveFromGymWest
 	waitmovement 0
 	copyobjectxytoperm 18
 	setvar VAR_SOOTOPOLIS_WALLACE_STATE, 2
 	return
 
-SootopolisCity_EventScript_1E64D8:: @ 81E64D8
-	msgbox SootopolisCity_Text_1E79C8, MSGBOX_DEFAULT
+SootopolisCity_EventScript_GoToSkyPillar:: @ 81E64D8
+	msgbox SootopolisCity_Text_HaventYouScaledSkyPillar, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_EventScript_1E64E2:: @ 81E64E2
-	msgbox SootopolisCity_Text_1E7CBC, MSGBOX_DEFAULT
+SootopolisCity_EventScript_GoToGym:: @ 81E64E2
+	msgbox SootopolisCity_Text_DazzledByMentor, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_Movement_1E64EC: @ 81E64EC
+SootopolisCity_Movement_WallaceMoveFromGym: @ 81E64EC
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_Movement_1E64EF: @ 81E64EF
+SootopolisCity_Movement_WallaceMoveFromGymWest: @ 81E64EF
 	walk_left
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_EventScript_1E64F2:: @ 81E64F2
+SootopolisCity_EventScript_Maxie:: @ 81E64F2
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6509
-	msgbox SootopolisCity_Text_1E72DB, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_MaxieRayquaza
+	msgbox SootopolisCity_Text_GroudonPleaseStop, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6509:: @ 81E6509
-	msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT
+SootopolisCity_EventScript_MaxieRayquaza:: @ 81E6509
+	msgbox SootopolisCity_Text_AfterAllOurScheming, MSGBOX_DEFAULT
 	setflag FLAG_MET_MAXIE_SOOTOPOLIS
-	goto_if_set FLAG_MET_ARCHIE_SOOTOPOLIS, SootopolisCity_EventScript_1E654C
+	goto_if_set FLAG_MET_ARCHIE_SOOTOPOLIS, SootopolisCity_EventScript_MaxieArchieLeave
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E651F:: @ 81E651F
+SootopolisCity_EventScript_Archie:: @ 81E651F
 	lockall
 	compare VAR_SOOTOPOLIS_CITY_STATE, 5
-	goto_if_eq SootopolisCity_EventScript_1E6536
-	msgbox SootopolisCity_Text_1E7460, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_EventScript_ArchieRayquaza
+	msgbox SootopolisCity_Text_KyogreCalmDown, MSGBOX_DEFAULT
 	closemessage
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E6536:: @ 81E6536
-	msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT
+SootopolisCity_EventScript_ArchieRayquaza:: @ 81E6536
+	msgbox SootopolisCity_Text_TryingMeaninglessToPokemon, MSGBOX_DEFAULT
 	setflag FLAG_MET_ARCHIE_SOOTOPOLIS
-	goto_if_set FLAG_MET_MAXIE_SOOTOPOLIS, SootopolisCity_EventScript_1E654C
+	goto_if_set FLAG_MET_MAXIE_SOOTOPOLIS, SootopolisCity_EventScript_MaxieArchieLeave
 	releaseall
 	end
 
-SootopolisCity_EventScript_1E654C:: @ 81E654C
+SootopolisCity_EventScript_MaxieArchieLeave:: @ 81E654C
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE
 	setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE
 	setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE
@@ -1441,36 +1447,37 @@ SootopolisCity_EventScript_1E654C:: @ 81E654C
 	releaseall
 	end
 
-SootopolisCity_Movement_1E656B:: @ 81E656B
+@ Unused
+SootopolisCity_Movement_Levitate:: @ 81E656B
 	levitate
 	step_end
 
-SootopolisCity_Movement_1E656D:: @ 81E656D
+@ Unused
+SootopolisCity_Movement_DestroyTask:: @ 81E656D
 	destroy_extra_task
 	step_end
 
-SootopolisCity_Text_1E656F: @ 81E656F
+SootopolisCity_Text_GymSign: @ 81E656F
 	.string "SOOTOPOLIS CITY POKéMON GYM\n"
 	.string "LEADER: JUAN\p"
 	.string "“The GYM LEADER with the beauty\n"
 	.string "of pure water!”$"
 
-SootopolisCity_Text_1E65C8: @ 81E65C8
+SootopolisCity_Text_CitySign: @ 81E65C8
 	.string "SOOTOPOLIS CITY\p"
 	.string "“The mystical city where history\n"
 	.string "slumbers.”$"
 
-
-SootopolisCity_Text_1E6604: @ 81E6604
+SootopolisCity_Text_DoorIsClosed: @ 81E6604
 	.string "The door is closed.$"
 
-SootopolisCity_Text_1E6618: @ 81E6618
+SootopolisCity_Text_PhysicallyFitLivingHere: @ 81E6618
 	.string "Diving in the sea. Climbing up and\n"
 	.string "down stairs all the time…\p"
 	.string "If you live in this town, you end up\n"
 	.string "getting physically fit.$"
 
-SootopolisCity_Text_1E6692: @ 81E6692
+SootopolisCity_Text_GiantPokemonSuddenlyAppeared: @ 81E6692
 	.string "These giant POKéMON suddenly appeared\n"
 	.string "in the middle of the city!\p"
 	.string "And, I've never seen them before!\p"
@@ -1479,56 +1486,56 @@ SootopolisCity_Text_1E6692: @ 81E6692
 	.string "Why can't they be friends, those\n"
 	.string "POKéMON?$"
 
-SootopolisCity_Text_1E6750: @ 81E6750
+SootopolisCity_Text_WhatIsThatGreenPokemon: @ 81E6750
 	.string "What? What? What?\n"
 	.string "What is that green POKéMON?!$"
 
-SootopolisCity_Text_1E677F: @ 81E677F
+SootopolisCity_Text_WhereDidLegendariesGo: @ 81E677F
 	.string "GROUDON and KYOGRE…\n"
 	.string "Where did they go?\p"
 	.string "Will they cause droughts or downpours\n"
 	.string "somewhere else?$"
 
-SootopolisCity_Text_1E67DC: @ 81E67DC
+SootopolisCity_Text_TwoPokemonArentAngry: @ 81E67DC
 	.string "I just get this sense somehow that\n"
 	.string "the two POKéMON aren't angry.\p"
 	.string "I think… They probably can't control\n"
 	.string "their own power…$"
 
-SootopolisCity_Text_1E6853: @ 81E6853
+SootopolisCity_Text_FlyingMonStoppedRampage: @ 81E6853
 	.string "That flying POKéMON came down from\n"
 	.string "the sky and stopped the rampaging\l"
 	.string "POKéMON…$"
 
-SootopolisCity_Text_1E68A1: @ 81E68A1
+SootopolisCity_Text_WonderWhatWorldIsLike: @ 81E68A1
 	.string "I… I've never been out of this city.\p"
 	.string "I wonder what the world is like on\n"
 	.string "the other side of this round sky?$"
 
-SootopolisCity_Text_1E690B: @ 81E690B
+SootopolisCity_Text_ThisIsWicked: @ 81E690B
 	.string "Wow!\n"
 	.string "This is wicked!$"
 
-SootopolisCity_Text_1E6920: @ 81E6920
+SootopolisCity_Text_ThatWasWicked: @ 81E6920
 	.string "Wow!\n"
 	.string "That was wicked!$"
 
-SootopolisCity_Text_1E6936: @ 81E6936
+SootopolisCity_Text_GoRedAndBlueMon: @ 81E6936
 	.string "Go for it, red POKéMON!\n"
 	.string "Don't back off, blue POKéMON!$"
 
-SootopolisCity_Text_1E696C: @ 81E696C
+SootopolisCity_Text_DoYouKnowMonNames: @ 81E696C
 	.string "… … … … … …\p"
 	.string "Hi, do you know the names of those\n"
 	.string "POKéMON fighting over there?$"
 
-SootopolisCity_Text_1E69B8: @ 81E69B8
+SootopolisCity_Text_GreenOneSettlesThings: @ 81E69B8
 	.string "I was wondering which one would win,\n"
 	.string "the red one or the blue one, but, oh no,\l"
 	.string "it's the green one that settles things!\p"
 	.string "Talk about a huge turn of events!$"
 
-SootopolisCity_Text_1E6A50: @ 81E6A50
+SootopolisCity_Text_SeeingLegendWithOwnEyes: @ 81E6A50
 	.string "There's an ancient legend that claims\n"
 	.string "the land and sea were shaped by\l"
 	.string "a colossal battle between POKéMON.\p"
@@ -1537,7 +1544,7 @@ SootopolisCity_Text_1E6A50: @ 81E6A50
 	.string "Whoa! I never expected to be\n"
 	.string "witness to something this huge!$"
 
-SootopolisCity_Text_1E6B2A: @ 81E6B2A
+SootopolisCity_Text_SawLegendWithOwnEyes: @ 81E6B2A
 	.string "There's an ancient legend that claims\n"
 	.string "the land and sea were shaped by\l"
 	.string "a colossal battle between POKéMON.\p"
@@ -1546,40 +1553,40 @@ SootopolisCity_Text_1E6B2A: @ 81E6B2A
 	.string "Whoa! I never expected to be\n"
 	.string "witness to something this huge!$"
 
-SootopolisCity_Text_1E6BFF: @ 81E6BFF
+SootopolisCity_Text_BigPokemonFighting: @ 81E6BFF
 	.string "A big POKéMON is fighting with\n"
 	.string "another big POKéMON!\p"
 	.string "Please, someone make them stop!$"
 
-SootopolisCity_Text_1E6C53: @ 81E6C53
+SootopolisCity_Text_PrettyMonCameFromSky: @ 81E6C53
 	.string "A pretty POKéMON came down from\n"
 	.string "the sky…$"
 
-SootopolisCity_Text_1E6C7C: @ 81E6C7C
+SootopolisCity_Text_SootopolisWillBeWrecked: @ 81E6C7C
 	.string "Oh, no!\n"
 	.string "SOOTOPOLIS CITY will get wrecked!$"
 
-SootopolisCity_Text_1E6CA6: @ 81E6CA6
+SootopolisCity_Text_SootopolisDidntGetWrecked: @ 81E6CA6
 	.string "SOOTOPOLIS CITY didn't get wrecked!$"
 
-SootopolisCity_Text_1E6CCA: @ 81E6CCA
+SootopolisCity_Text_NoOrdinaryTourist: @ 81E6CCA
 	.string "Hm!\n"
 	.string "You've come all the way to SOOTOPOLIS?\l"
 	.string "You're no ordinary tourist.\p"
 	.string "But I suppose that doesn't make you\n"
 	.string "an extraordinary tourist, either.$"
 
-SootopolisCity_Text_1E6D57: @ 81E6D57
+SootopolisCity_Text_CityRegainedCalm: @ 81E6D57
 	.string "The city has regained its calm…$"
 
-SootopolisCity_Text_1E6D77: @ 81E6D77
+SootopolisCity_Text_CaveOfOriginPleaseLeave: @ 81E6D77
 	.string "Who might you be?\p"
 	.string "This is the CAVE OF ORIGIN.\p"
 	.string "The spirits of POKéMON, becalmed at\n"
 	.string "MT. PYRE, are said to be revived here.\p"
 	.string "Please leave.$"
 
-SootopolisCity_Text_1E6DFE: @ 81E6DFE
+SootopolisCity_Text_LeadSuperiorTrainerToCave: @ 81E6DFE
 	.string "A person with a strong will and\n"
 	.string "superior talent…\p"
 	.string "A TRAINER who has knowledge and\n"
@@ -1588,18 +1595,18 @@ SootopolisCity_Text_1E6DFE: @ 81E6DFE
 	.string "instructed by WALLACE to lead that\l"
 	.string "TRAINER to this CAVE.$"
 
-SootopolisCity_Text_1E6ED4: @ 81E6ED4
+SootopolisCity_Text_AwakenedPokemonClash: @ 81E6ED4
 	.string "Oh, my…\p"
 	.string "The clash between the two awakened\n"
 	.string "POKéMON was quelled by the awakening\l"
 	.string "of a third POKéMON…$"
 
-SootopolisCity_Text_1E6F38: @ 81E6F38
+SootopolisCity_Text_CaveOfOriginSleepsToo: @ 81E6F38
 	.string "This is the CAVE OF ORIGIN…\p"
 	.string "With the passing of the crisis,\n"
 	.string "the cave, too, shall sleep…$"
 
-SootopolisCity_Text_1E6F90: @ 81E6F90
+SootopolisCity_Text_SootopolisSkyBeautiful: @ 81E6F90
 	.string "SOOTOPOLIS sprang up as a town in\n"
 	.string "the crater of a volcano.\p"
 	.string "If you look up at the sky, the lip of\n"
@@ -1608,23 +1615,23 @@ SootopolisCity_Text_1E6F90: @ 81E6F90
 	.string "But that's what makes the sky above\n"
 	.string "SOOTOPOLIS the most beautiful.$"
 
-SootopolisCity_Text_1E7078: @ 81E7078
+SootopolisCity_Text_GiganticPokemonFight: @ 81E7078
 	.string "When two POKéMON that gigantic\n"
 	.string "are fighting that savagely, there's\l"
 	.string "not much that we can do.$"
 
-SootopolisCity_Text_1E70D4: @ 81E70D4
+SootopolisCity_Text_FearedWorstWhenPokemonFlewDown: @ 81E70D4
 	.string "When that third POKéMON flew down,\n"
 	.string "I feared the worst.$"
 
-SootopolisCity_Text_1E710B: @ 81E710B
+SootopolisCity_Text_NightSkyFavoriteScenery: @ 81E710B
 	.string "A circle of a night sky framed by\n"
 	.string "the crater of a volcano…\p"
 	.string "And in that ring, stars flicker and\n"
 	.string "blink as if they were alive…\l"
 	.string "It's my favorite scenery.$"
 
-SootopolisCity_Text_1E71A1: @ 81E71A1
+SootopolisCity_Text_WeatherWentWild: @ 81E71A1
 	.string "The weather was clear this morning,\n"
 	.string "but…\p"
 	.string "All of a sudden, dark clouds brewed up,\n"
@@ -1635,20 +1642,20 @@ SootopolisCity_Text_1E71A1: @ 81E71A1
 	.string "Is all of this because of those\n"
 	.string "POKéMON?$"
 
-SootopolisCity_Text_1E728C: @ 81E728C
+SootopolisCity_Text_YouBroughtFlyingMon: @ 81E728C
 	.string "Oh?\p"
 	.string "It was you who brought that flying\n"
 	.string "POKéMON here?\p"
 	.string "Well, aren't you amazing!$"
 
-SootopolisCity_Text_1E72DB: @ 81E72DB
+SootopolisCity_Text_GroudonPleaseStop: @ 81E72DB
 	.string "MAXIE: G… GROUDON…\n"
 	.string "Please! Stop what you're doing!\p"
 	.string "I know the extent of your power now!\p"
 	.string "If you keep going, all HOENN, not just\n"
 	.string "SOOTOPOLIS, will be utterly ruined!$"
 
-SootopolisCity_Text_1E737E: @ 81E737E
+SootopolisCity_Text_AfterAllOurScheming: @ 81E737E
 	.string "MAXIE: So the super-ancient POKéMON\n"
 	.string "weren't only GROUDON and KYOGRE…\p"
 	.string "After all our fruitless scheming and\n"
@@ -1658,7 +1665,7 @@ SootopolisCity_Text_1E737E: @ 81E737E
 	.string "Fu…\n"
 	.string "Fuhahaha…$"
 
-SootopolisCity_Text_1E7460: @ 81E7460
+SootopolisCity_Text_KyogreCalmDown: @ 81E7460
 	.string "ARCHIE: KYOGRE! What's wrong?!\n"
 	.string "Look over here! It's the RED ORB!\l"
 	.string "Calm down! KYOGRE!\p"
@@ -1667,7 +1674,7 @@ SootopolisCity_Text_1E7460: @ 81E7460
 	.string "It's no good!\n"
 	.string "It's not responding at all!$"
 
-SootopolisCity_Text_1E74F6: @ 81E74F6
+SootopolisCity_Text_TryingMeaninglessToPokemon: @ 81E74F6
 	.string "ARCHIE: KYOGRE and GROUDON both\n"
 	.string "flew off to who knows where.\p"
 	.string "The weather in HOENN has returned\n"
@@ -1678,7 +1685,7 @@ SootopolisCity_Text_1E74F6: @ 81E74F6
 	.string "something small, even meaningless,\l"
 	.string "to POKéMON…$"
 
-SootopolisCity_Text_1E75CB: @ 81E75CB
+SootopolisCity_Text_InvolvedWithCrisisComeWithMe: @ 81E75CB
 	.string "STEVEN: Those POKéMON fighting…\n"
 	.string "GROUDON… And KYOGRE…\p"
 	.string "The two super-ancient POKéMON\n"
@@ -1693,7 +1700,7 @@ SootopolisCity_Text_1E75CB: @ 81E75CB
 	.string "I'd like you to meet.\p"
 	.string "Come with me, please.$"
 
-SootopolisCity_Text_1E7737: @ 81E7737
+SootopolisCity_Text_DoesThisMakeYourFearPokemon: @ 81E7737
 	.string "STEVEN: Listen, {PLAYER}{KUN}.\p"
 	.string "Does seeing GROUDON and KYOGRE make\n"
 	.string "you think POKéMON are to be feared?\p"
@@ -1702,34 +1709,34 @@ SootopolisCity_Text_1E7737: @ 81E7737
 	.string "…Why am I asking you this?\n"
 	.string "You already know.$"
 
-SootopolisCity_Text_1E77F0: @ 81E77F0
+SootopolisCity_Text_HereWereAreHelpWallace: @ 81E77F0
 	.string "STEVEN: Okay, here we are!\p"
 	.string "Inside here you'll find someone named\n"
 	.string "WALLACE.\p"
 	.string "I think you have what's needed to\n"
 	.string "help him…$"
 
-SootopolisCity_Text_1E7866: @ 81E7866
+SootopolisCity_Text_KnowWhatsNeededToHelpHim: @ 81E7866
 	.string "STEVEN: I think you have what's\n"
 	.string "needed to help him…$"
 
-SootopolisCity_Text_1E789A: @ 81E789A
+SootopolisCity_Text_NeverBeenToSkyPillar: @ 81E789A
 	.string "STEVEN: The SKY PILLAR…\p"
 	.string "I've never been there.\n"
 	.string "I wonder where it could be?$"
 
-SootopolisCity_Text_1E78E5: @ 81E78E5
+SootopolisCity_Text_SoThatsRayquaza: @ 81E78E5
 	.string "STEVEN: So that's RAYQUAZA…\p"
 	.string "It's incredible how the two rampaging\n"
 	.string "POKéMON would flee from it in fear…$"
 
-SootopolisCity_Text_1E794B: @ 81E794B
+SootopolisCity_Text_MaxieArchieLeft: @ 81E794B
 	.string "STEVEN: It looks like both MAXIE and\n"
 	.string "ARCHIE have gone away somewhere.\p"
 	.string "Perhaps they've gone to MT. PYRE to\n"
 	.string "return those ORBS…$"
 
-SootopolisCity_Text_1E79C8: @ 81E79C8
+SootopolisCity_Text_HaventYouScaledSkyPillar: @ 81E79C8
 	.string "WALLACE: Oh?\n"
 	.string "{PLAYER}{KUN}?\p"
 	.string "Haven't you scaled the SKY PILLAR\n"
@@ -1737,14 +1744,14 @@ SootopolisCity_Text_1E79C8: @ 81E79C8
 	.string "I'm sure that you can make it to\n"
 	.string "the top of the SKY PILLAR…$"
 
-SootopolisCity_Text_1E7A3E: @ 81E7A3E
+SootopolisCity_Text_AquaMagmaDidntMeanHarm: @ 81E7A3E
 	.string "WALLACE: {PLAYER}{KUN}…\p"
 	.string "The leaders of TEAM MAGMA and AQUA,\n"
 	.string "I don't think they meant harm.\p"
 	.string "It wouldn't hurt to hear what they\n"
 	.string "have to say for themselves.$"
 
-SootopolisCity_Text_1E7ACF: @ 81E7ACF
+SootopolisCity_Text_ThankYouForHelpAcceptThis: @ 81E7ACF
 	.string "WALLACE: {PLAYER}{KUN}…\n"
 	.string "My eyes didn't deceive me.\p"
 	.string "Thanks to your help, SOOTOPOLIS…\n"
@@ -1753,7 +1760,7 @@ SootopolisCity_Text_1E7ACF: @ 81E7ACF
 	.string "This is a gift from me.\n"
 	.string "Please accept it.$"
 
-SootopolisCity_Text_1E7B86: @ 81E7B86
+SootopolisCity_Text_ExplainWaterfallGoToGym: @ 81E7B86
 	.string "That HIDDEN MACHINE contains\n"
 	.string "WATERFALL.\p"
 	.string "If you have the RAIN BADGE, a POKéMON\n"
@@ -1766,7 +1773,7 @@ SootopolisCity_Text_1E7B86: @ 81E7B86
 	.string "When you're all set to go, step through\n"
 	.string "that door.$"
 
-SootopolisCity_Text_1E7CBC: @ 81E7CBC
+SootopolisCity_Text_DazzledByMentor: @ 81E7CBC
 	.string "WALLACE: I'm sure that you will be\n"
 	.string "dazzled by my mentor's breathtakingly\l"
 	.string "elegant battle style.$"
diff --git a/data/maps/SootopolisCity_House1/map.json b/data/maps/SootopolisCity_House1/map.json
index 2be2adebe..bd1488d14 100644
--- a/data/maps/SootopolisCity_House1/map.json
+++ b/data/maps/SootopolisCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House1_EventScript_22694D",
+      "script": "SootopolisCity_House1_EventScript_BrickBreakBlackBelt",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House1_EventScript_22698E",
+      "script": "SootopolisCity_House1_EventScript_Kecleon",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc
index 13b581c71..d38e35494 100644
--- a/data/maps/SootopolisCity_House1/scripts.inc
+++ b/data/maps/SootopolisCity_House1/scripts.inc
@@ -1,44 +1,44 @@
 SootopolisCity_House1_MapScripts:: @ 822694C
 	.byte 0
 
-SootopolisCity_House1_EventScript_22694D:: @ 822694D
+SootopolisCity_House1_EventScript_BrickBreakBlackBelt:: @ 822694D
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_226984
-	msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_ReceivedBrickBreak
+	msgbox SootopolisCity_House1_Text_DevelopedThisTM, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM31
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM31
-	msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House1_Text_ExplainBrickBreak, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House1_EventScript_226984:: @ 8226984
-	msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT
+SootopolisCity_House1_EventScript_ReceivedBrickBreak:: @ 8226984
+	msgbox SootopolisCity_House1_Text_ExplainBrickBreak, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House1_EventScript_22698E:: @ 822698E
+SootopolisCity_House1_EventScript_Kecleon:: @ 822698E
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_KECLEON, 0
-	msgbox SootopolisCity_House1_Text_226A60, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House1_Text_Kecleon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SootopolisCity_House1_Text_2269A1: @ 82269A1
+SootopolisCity_House1_Text_DevelopedThisTM: @ 82269A1
 	.string "For thirty years I've remained in\n"
 	.string "SOOTOPOLIS honing my skills.\p"
 	.string "I developed a shattering TM.\n"
 	.string "I bequeath it to you!$"
 
-SootopolisCity_House1_Text_226A13: @ 8226A13
+SootopolisCity_House1_Text_ExplainBrickBreak: @ 8226A13
 	.string "TM31 contains BRICK BREAK! It's a move\n"
 	.string "so horrible that I can't describe it.$"
 
-SootopolisCity_House1_Text_226A60: @ 8226A60
+SootopolisCity_House1_Text_Kecleon: @ 8226A60
 	.string "KECLEON: Puu puhyaah.$"
 
diff --git a/data/maps/SootopolisCity_House2/map.json b/data/maps/SootopolisCity_House2/map.json
index af03fdff5..ae30df6c6 100644
--- a/data/maps/SootopolisCity_House2/map.json
+++ b/data/maps/SootopolisCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House2_EventScript_226A77",
+      "script": "SootopolisCity_House2_EventScript_ExpertF",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House2/scripts.inc b/data/maps/SootopolisCity_House2/scripts.inc
index 4bdf401cf..31388cbb4 100644
--- a/data/maps/SootopolisCity_House2/scripts.inc
+++ b/data/maps/SootopolisCity_House2/scripts.inc
@@ -1,36 +1,36 @@
 SootopolisCity_House2_MapScripts:: @ 8226A76
 	.byte 0
 
-SootopolisCity_House2_EventScript_226A77:: @ 8226A77
+SootopolisCity_House2_EventScript_ExpertF:: @ 8226A77
 	lock
 	faceplayer
-	msgbox SootopolisCity_House2_Text_226AAB, MSGBOX_YESNO
+	msgbox SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	call_if_eq SootopolisCity_House2_EventScript_226A99
+	call_if_eq SootopolisCity_House2_EventScript_KnowAboutOrbs
 	compare VAR_RESULT, NO
-	call_if_eq SootopolisCity_House2_EventScript_226AA2
+	call_if_eq SootopolisCity_House2_EventScript_DontKnowAboutOrbs
 	release
 	end
 
-SootopolisCity_House2_EventScript_226A99:: @ 8226A99
-	msgbox SootopolisCity_House2_Text_226AF1, MSGBOX_DEFAULT
+SootopolisCity_House2_EventScript_KnowAboutOrbs:: @ 8226A99
+	msgbox SootopolisCity_House2_Text_YesTwoOrbsSideBySide, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_House2_EventScript_226AA2:: @ 8226AA2
-	msgbox SootopolisCity_House2_Text_226B41, MSGBOX_DEFAULT
+SootopolisCity_House2_EventScript_DontKnowAboutOrbs:: @ 8226AA2
+	msgbox SootopolisCity_House2_Text_OughtToVisitAndSee, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_House2_Text_226AAB: @ 8226AAB
+SootopolisCity_House2_Text_DidYouKnowAboutMtPyreOrbs: @ 8226AAB
 	.string "MT. PYRE…\p"
 	.string "At its peak are two orbs placed side\n"
 	.string "by side. Did you know?$"
 
-SootopolisCity_House2_Text_226AF1: @ 8226AF1
+SootopolisCity_House2_Text_YesTwoOrbsSideBySide: @ 8226AF1
 	.string "Yes, two orbs side by side…\p"
 	.string "The sight of them together…\n"
 	.string "It is somehow soothing…$"
 
-SootopolisCity_House2_Text_226B41: @ 8226B41
+SootopolisCity_House2_Text_OughtToVisitAndSee: @ 8226B41
 	.string "Is that so?\n"
 	.string "Perhaps you ought to visit and see…$"
 
diff --git a/data/maps/SootopolisCity_House3/map.json b/data/maps/SootopolisCity_House3/map.json
index af925c4c9..b87274eee 100644
--- a/data/maps/SootopolisCity_House3/map.json
+++ b/data/maps/SootopolisCity_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House3_EventScript_226B72",
+      "script": "SootopolisCity_House3_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House3_EventScript_226B9B",
+      "script": "SootopolisCity_House3_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House3/scripts.inc b/data/maps/SootopolisCity_House3/scripts.inc
index a9aaea09c..c22a29a94 100644
--- a/data/maps/SootopolisCity_House3/scripts.inc
+++ b/data/maps/SootopolisCity_House3/scripts.inc
@@ -1,41 +1,41 @@
 SootopolisCity_House3_MapScripts:: @ 8226B71
 	.byte 0
 
-SootopolisCity_House3_EventScript_226B72:: @ 8226B72
+SootopolisCity_House3_EventScript_Woman:: @ 8226B72
 	lock
 	faceplayer
-	msgbox SootopolisCity_House3_Text_226BA4, MSGBOX_YESNO
+	msgbox SootopolisCity_House3_Text_JuanHasManyFansDoYou, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq SootopolisCity_House3_EventScript_226B91
-	msgbox SootopolisCity_House3_Text_226C44, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_House3_EventScript_HaveFans
+	msgbox SootopolisCity_House3_Text_LonesomeTryWorkingHarder, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House3_EventScript_226B91:: @ 8226B91
-	msgbox SootopolisCity_House3_Text_226C20, MSGBOX_DEFAULT
+SootopolisCity_House3_EventScript_HaveFans:: @ 8226B91
+	msgbox SootopolisCity_House3_Text_YouMustBePrettyStrong, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House3_EventScript_226B9B:: @ 8226B9B
-	msgbox SootopolisCity_House3_Text_226C9C, MSGBOX_NPC
+SootopolisCity_House3_EventScript_Girl:: @ 8226B9B
+	msgbox SootopolisCity_House3_Text_TrainerFanClubWasWild, MSGBOX_NPC
 	end
 
-SootopolisCity_House3_Text_226BA4: @ 8226BA4
+SootopolisCity_House3_Text_JuanHasManyFansDoYou: @ 8226BA4
 	.string "You're a POKéMON TRAINER, aren't you?\p"
 	.string "SOOTOPOLIS's JUAN has many fans.\n"
 	.string "Even more than his student WALLACE!\p"
 	.string "Do you have any?$"
 
-SootopolisCity_House3_Text_226C20: @ 8226C20
+SootopolisCity_House3_Text_YouMustBePrettyStrong: @ 8226C20
 	.string "Oh, then you must be pretty strong.$"
 
-SootopolisCity_House3_Text_226C44: @ 8226C44
+SootopolisCity_House3_Text_LonesomeTryWorkingHarder: @ 8226C44
 	.string "Oh, dear…\n"
 	.string "That's a little lonesome.\p"
 	.string "Try working a little harder to get\n"
 	.string "a fan following.$"
 
-SootopolisCity_House3_Text_226C9C: @ 8226C9C
+SootopolisCity_House3_Text_TrainerFanClubWasWild: @ 8226C9C
 	.string "Dedicated fans come over from even\n"
 	.string "outside of HOENN.\p"
 	.string "It was really wild when I went to the\n"
diff --git a/data/maps/SootopolisCity_House4/map.json b/data/maps/SootopolisCity_House4/map.json
index db7ffd5d4..586c88e90 100644
--- a/data/maps/SootopolisCity_House4/map.json
+++ b/data/maps/SootopolisCity_House4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House4_EventScript_226D16",
+      "script": "SootopolisCity_House4_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House4_EventScript_226D1F",
+      "script": "SootopolisCity_House4_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House4_EventScript_226D28",
+      "script": "SootopolisCity_House4_EventScript_Azumarill",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House4/scripts.inc b/data/maps/SootopolisCity_House4/scripts.inc
index a8aa58548..861da06d2 100644
--- a/data/maps/SootopolisCity_House4/scripts.inc
+++ b/data/maps/SootopolisCity_House4/scripts.inc
@@ -1,25 +1,25 @@
 SootopolisCity_House4_MapScripts:: @ 8226D15
 	.byte 0
 
-SootopolisCity_House4_EventScript_226D16:: @ 8226D16
-	msgbox SootopolisCity_House4_Text_226D3B, MSGBOX_NPC
+SootopolisCity_House4_EventScript_Man:: @ 8226D16
+	msgbox SootopolisCity_House4_Text_AncientTreasuresWaitingInSea, MSGBOX_NPC
 	end
 
-SootopolisCity_House4_EventScript_226D1F:: @ 8226D1F
-	msgbox SootopolisCity_House4_Text_226DEA, MSGBOX_NPC
+SootopolisCity_House4_EventScript_Woman:: @ 8226D1F
+	msgbox SootopolisCity_House4_Text_StrollUnderwaterWithPokemon, MSGBOX_NPC
 	end
 
-SootopolisCity_House4_EventScript_226D28:: @ 8226D28
+SootopolisCity_House4_EventScript_Azumarill:: @ 8226D28
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox SootopolisCity_House4_Text_226E7F, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House4_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SootopolisCity_House4_Text_226D3B: @ 8226D3B
+SootopolisCity_House4_Text_AncientTreasuresWaitingInSea: @ 8226D3B
 	.string "Listen up, and I'll tell you something\n"
 	.string "good.\p"
 	.string "There's supposed to be an ancient\n"
@@ -27,13 +27,13 @@ SootopolisCity_House4_Text_226D3B: @ 8226D3B
 	.string "There could be treasures just waiting\n"
 	.string "to be discovered down there.$"
 
-SootopolisCity_House4_Text_226DEA: @ 8226DEA
+SootopolisCity_House4_Text_StrollUnderwaterWithPokemon: @ 8226DEA
 	.string "Ancient treasures…\p"
 	.string "It would be nice if they existed, but\n"
 	.string "even if they didn't, it would be so\l"
 	.string "beautiful to take an underwater\l"
 	.string "stroll with my POKéMON.$"
 
-SootopolisCity_House4_Text_226E7F: @ 8226E7F
+SootopolisCity_House4_Text_Azumarill: @ 8226E7F
 	.string "AZUMARILL: Marurii.$"
 
diff --git a/data/maps/SootopolisCity_House5/map.json b/data/maps/SootopolisCity_House5/map.json
index 5e20e33df..fcfce0abb 100644
--- a/data/maps/SootopolisCity_House5/map.json
+++ b/data/maps/SootopolisCity_House5/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House5_EventScript_226E94",
+      "script": "SootopolisCity_House5_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House5_EventScript_226E9D",
+      "script": "SootopolisCity_House5_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House5/scripts.inc b/data/maps/SootopolisCity_House5/scripts.inc
index 04b9feca2..027a35bcf 100644
--- a/data/maps/SootopolisCity_House5/scripts.inc
+++ b/data/maps/SootopolisCity_House5/scripts.inc
@@ -1,20 +1,20 @@
 SootopolisCity_House5_MapScripts:: @ 8226E93
 	.byte 0
 
-SootopolisCity_House5_EventScript_226E94:: @ 8226E94
-	msgbox SootopolisCity_House5_Text_226EA6, MSGBOX_NPC
+SootopolisCity_House5_EventScript_Maniac:: @ 8226E94
+	msgbox SootopolisCity_House5_Text_SootopolisMtPyreConnection, MSGBOX_NPC
 	end
 
-SootopolisCity_House5_EventScript_226E9D:: @ 8226E9D
-	msgbox SootopolisCity_House5_Text_226F35, MSGBOX_NPC
+SootopolisCity_House5_EventScript_Girl:: @ 8226E9D
+	msgbox SootopolisCity_House5_Text_BrotherUsedToStudySea, MSGBOX_NPC
 	end
 
-SootopolisCity_House5_Text_226EA6: @ 8226EA6
+SootopolisCity_House5_Text_SootopolisMtPyreConnection: @ 8226EA6
 	.string "There appears to be some connection\n"
 	.string "between SOOTOPOLIS and MT. PYRE.\p"
 	.string "My friends and I did some research on\n"
 	.string "it at the lab where I used to work.$"
 
-SootopolisCity_House5_Text_226F35: @ 8226F35
+SootopolisCity_House5_Text_BrotherUsedToStudySea: @ 8226F35
 	.string "My big brother used to study the sea.$"
 
diff --git a/data/maps/SootopolisCity_House6/map.json b/data/maps/SootopolisCity_House6/map.json
index 717590318..bd7e23882 100644
--- a/data/maps/SootopolisCity_House6/map.json
+++ b/data/maps/SootopolisCity_House6/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House6_EventScript_226F5C",
+      "script": "SootopolisCity_House6_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc
index 015ac2e36..bd3ce0742 100644
--- a/data/maps/SootopolisCity_House6/scripts.inc
+++ b/data/maps/SootopolisCity_House6/scripts.inc
@@ -1,55 +1,55 @@
 SootopolisCity_House6_MapScripts:: @ 8226F5B
 	.byte 0
 
-SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C
+SootopolisCity_House6_EventScript_Woman:: @ 8226F5C
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_226FA3
-	msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO
+	goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_ReceivedWailmerDoll
+	msgbox SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	call_if_eq SootopolisCity_House6_EventScript_226F99
-	msgbox SootopolisCity_House6_Text_227034, MSGBOX_DEFAULT
+	call_if_eq SootopolisCity_House6_EventScript_DeclineWailmerDoll
+	msgbox SootopolisCity_House6_Text_TakeGoodCareOfIt, MSGBOX_DEFAULT
 	givedecoration_std DECOR_WAILMER_DOLL
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_House6_EventScript_226FAD
+	compare VAR_RESULT, FALSE
+	goto_if_eq SootopolisCity_House6_EventScript_NoRoomForWailmerDoll
 	setflag FLAG_RECEIVED_WAILMER_DOLL
 	release
 	end
 
-SootopolisCity_House6_EventScript_226F99:: @ 8226F99
-	msgbox SootopolisCity_House6_Text_22708F, MSGBOX_DEFAULT
+SootopolisCity_House6_EventScript_DeclineWailmerDoll:: @ 8226F99
+	msgbox SootopolisCity_House6_Text_DontWantThisDoll, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_EventScript_226FA3:: @ 8226FA3
-	msgbox SootopolisCity_House6_Text_2270B7, MSGBOX_DEFAULT
+SootopolisCity_House6_EventScript_ReceivedWailmerDoll:: @ 8226FA3
+	msgbox SootopolisCity_House6_Text_LovePlushDolls, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_EventScript_226FAD:: @ 8226FAD
+SootopolisCity_House6_EventScript_NoRoomForWailmerDoll:: @ 8226FAD
 	bufferdecorationname 1, DECOR_WAILMER_DOLL
 	msgbox gText_NoRoomLeftForAnother, MSGBOX_DEFAULT
-	msgbox SootopolisCity_House6_Text_22704A, MSGBOX_DEFAULT
+	msgbox SootopolisCity_House6_Text_IllHoldItForYou, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_House6_Text_226FC3: @ 8226FC3
+SootopolisCity_House6_Text_FirstGuestInWhileTakeDoll: @ 8226FC3
 	.string "Hello! You're our first guest in\n"
 	.string "a good while.\p"
 	.string "You've brightened up my day, so I'll\n"
 	.string "give you a big WAILMER DOLL.$"
 
-SootopolisCity_House6_Text_227034: @ 8227034
+SootopolisCity_House6_Text_TakeGoodCareOfIt: @ 8227034
 	.string "Take good care of it!$"
 
-SootopolisCity_House6_Text_22704A: @ 822704A
+SootopolisCity_House6_Text_IllHoldItForYou: @ 822704A
 	.string "Oh, you want it, but not right now?\n"
 	.string "Okay, then I'll hold it for you.$"
 
-SootopolisCity_House6_Text_22708F: @ 822708F
+SootopolisCity_House6_Text_DontWantThisDoll: @ 822708F
 	.string "Are you sure?\n"
 	.string "You don't want this DOLL?$"
 
-SootopolisCity_House6_Text_2270B7: @ 82270B7
+SootopolisCity_House6_Text_LovePlushDolls: @ 82270B7
 	.string "I love plush DOLLS!$"
 
diff --git a/data/maps/SootopolisCity_House7/map.json b/data/maps/SootopolisCity_House7/map.json
index 4d500fcb0..497b36bba 100644
--- a/data/maps/SootopolisCity_House7/map.json
+++ b/data/maps/SootopolisCity_House7/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House7_EventScript_2270CC",
+      "script": "SootopolisCity_House7_EventScript_OldMan",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_House7_EventScript_2270D5",
+      "script": "SootopolisCity_House7_EventScript_PokefanF",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_House7/scripts.inc b/data/maps/SootopolisCity_House7/scripts.inc
index eac8ef346..b7b11208e 100644
--- a/data/maps/SootopolisCity_House7/scripts.inc
+++ b/data/maps/SootopolisCity_House7/scripts.inc
@@ -1,15 +1,15 @@
 SootopolisCity_House7_MapScripts:: @ 82270CB
 	.byte 0
 
-SootopolisCity_House7_EventScript_2270CC:: @ 82270CC
-	msgbox SootopolisCity_House7_Text_2270DE, MSGBOX_NPC
+SootopolisCity_House7_EventScript_OldMan:: @ 82270CC
+	msgbox SootopolisCity_House7_Text_CityFromEruptedVolcano, MSGBOX_NPC
 	end
 
-SootopolisCity_House7_EventScript_2270D5:: @ 82270D5
-	msgbox SootopolisCity_House7_Text_227190, MSGBOX_NPC
+SootopolisCity_House7_EventScript_PokefanF:: @ 82270D5
+	msgbox SootopolisCity_House7_Text_CaveMadeToKeepSomething, MSGBOX_NPC
 	end
 
-SootopolisCity_House7_Text_2270DE: @ 82270DE
+SootopolisCity_House7_Text_CityFromEruptedVolcano: @ 82270DE
 	.string "An underwater volcano erupted and\n"
 	.string "forced itself up from the depths.\p"
 	.string "Its crater emerged from the sea and\n"
@@ -17,7 +17,7 @@ SootopolisCity_House7_Text_2270DE: @ 82270DE
 	.string "That's how SOOTOPOLIS CITY came into\n"
 	.string "being.$"
 
-SootopolisCity_House7_Text_227190: @ 8227190
+SootopolisCity_House7_Text_CaveMadeToKeepSomething: @ 8227190
 	.string "The cave that links SOOTOPOLIS and\n"
 	.string "the outside world…\p"
 	.string "It seems as if the cave was made to\n"
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
index d7ed8b980..bf19b4e03 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC",
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_LotadBrother",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22722B",
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotBrother",
       "flag": "0"
     }
   ],
@@ -65,7 +65,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22734D"
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotSizeRecord"
     },
     {
       "type": "sign",
@@ -73,7 +73,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_22735B"
+      "script": "SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
index 496b16d11..a9f3ffdf4 100644
--- a/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
+++ b/data/maps/SootopolisCity_LotadAndSeedotHouse/scripts.inc
@@ -1,119 +1,119 @@
 SootopolisCity_LotadAndSeedotHouse_MapScripts:: @ 822722A
 	.byte 0
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22722B:: @ 822722B
+SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotBrother:: @ 822722B
 	special GetSeedotSizeRecordInfo
 	lock
 	faceplayer
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227369, MSGBOX_DEFAULT
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigSeedot, MSGBOX_DEFAULT
 	special ChoosePartyMon
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare VAR_RESULT, 255
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227272
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowSeedot
 	special CompareSeedotSize
 	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22727C
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NotSeedot
 	compare VAR_RESULT, 2
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227286
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot
 	compare VAR_RESULT, 3
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227290
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227272:: @ 8227272
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_2275BC, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowSeedot:: @ 8227272
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22727C:: @ 822727C
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227584, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_NotSeedot:: @ 822727C
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227286:: @ 8227286
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227544, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_SmallSeedot:: @ 8227286
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerSeedot, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227290:: @ 8227290
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227480, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_BigSeedot:: @ 8227290
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad, MSGBOX_DEFAULT
 	giveitem_std ITEM_ELIXIR
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2
+	compare VAR_RESULT, FALSE
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1
 	closemessage
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_2272B2:: @ 82272B2
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227524, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir1:: @ 82272B2
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull1, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_2272BC:: @ 82272BC
+SootopolisCity_LotadAndSeedotHouse_EventScript_LotadBrother:: @ 82272BC
 	special GetLotadSizeRecordInfo
 	lock
 	faceplayer
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227676, MSGBOX_DEFAULT
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigLotad, MSGBOX_DEFAULT
 	special ChoosePartyMon
 	waitstate
 	copyvar VAR_RESULT, VAR_0x8004
 	compare VAR_RESULT, 255
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227303
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowLotad
 	special CompareLotadSize
 	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_22730D
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NotLotad
 	compare VAR_RESULT, 2
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227317
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad
 	compare VAR_RESULT, 3
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227321
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227303:: @ 8227303
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227896, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_CancelShowLotad:: @ 8227303
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22730D:: @ 822730D
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227867, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_NotLotad:: @ 822730D
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227317:: @ 8227317
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_22782A, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_SmallLotad:: @ 8227317
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerLotad, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227321:: @ 8227321
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_22776C, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_BigLotad:: @ 8227321
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot, MSGBOX_DEFAULT
 	giveitem_std ITEM_ELIXIR
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_227343
+	compare VAR_RESULT, FALSE
+	goto_if_eq SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2
 	closemessage
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_227343:: @ 8227343
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_22780A, MSGBOX_DEFAULT
+SootopolisCity_LotadAndSeedotHouse_EventScript_NoRoomForElixir2:: @ 8227343
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull2, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22734D:: @ 822734D
+SootopolisCity_LotadAndSeedotHouse_EventScript_SeedotSizeRecord:: @ 822734D
 	special GetSeedotSizeRecordInfo
 	lockall
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_227617, MSGBOX_DEFAULT
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BiggestSeedotInHistory, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_LotadAndSeedotHouse_EventScript_22735B:: @ 822735B
+SootopolisCity_LotadAndSeedotHouse_EventScript_LotadSizeRecord:: @ 822735B
 	special GetLotadSizeRecordInfo
 	lockall
-	msgbox SootopolisCity_LotadAndSeedotHouse_Text_2278F2, MSGBOX_DEFAULT
+	msgbox SootopolisCity_LotadAndSeedotHouse_Text_BiggestLotadInHistory, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SootopolisCity_LotadAndSeedotHouse_Text_227369: @ 8227369
+SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigSeedot: @ 8227369
 	.string "Do you know the POKéMON SEEDOT?\n"
 	.string "It's hardly ever seen in SOOTOPOLIS.\p"
 	.string "Anyway, I love big SEEDOT.\n"
@@ -125,7 +125,7 @@ SootopolisCity_LotadAndSeedotHouse_Text_227369: @ 8227369
 	.string "Huh? Do you have a SEEDOT with you?\n"
 	.string "P-p-please, show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227480: @ 8227480
+SootopolisCity_LotadAndSeedotHouse_Text_GoshMightBeBiggerThanLotad: @ 8227480
 	.string "{STR_VAR_2} inches!\n"
 	.string "Oh, my gosh, this is a big one!\p"
 	.string "It might even beat the big LOTAD\n"
@@ -133,35 +133,36 @@ SootopolisCity_LotadAndSeedotHouse_Text_227480: @ 8227480
 	.string "Thanks for showing me.\n"
 	.string "This is my thanks!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_22750E: @ 822750E
+@ Unused
+SootopolisCity_LotadAndSeedotHouse_Text_ReceivedPotion1: @ 822750E
 	.string "{PLAYER} received a POTION.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227524: @ 8227524
+SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull1: @ 8227524
 	.string "Hunh?\n"
 	.string "Your BAG is crammed full.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227544: @ 8227544
+SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerSeedot: @ 8227544
 	.string "{STR_VAR_2} inches, is it?\p"
 	.string "Hmm… I've seen a bigger SEEDOT\n"
 	.string "than this one.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227584: @ 8227584
+SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotSeedot: @ 8227584
 	.string "Oh, now this is quite something…\n"
 	.string "But it's not a SEEDOT!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_2275BC: @ 82275BC
+SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigSeedot: @ 82275BC
 	.string "You don't have a big SEEDOT?\n"
 	.string "That's too bad…\p"
 	.string "If you get a big SEEDOT, please\n"
 	.string "come show me.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227617: @ 8227617
+SootopolisCity_LotadAndSeedotHouse_Text_BiggestSeedotInHistory: @ 8227617
 	.string "The biggest SEEDOT in history!\n"
 	.string "{STR_VAR_2}'s {STR_VAR_3}-inch giant!\p"
 	.string "A SEEDOT bigger than a LOTAD\n"
 	.string "always wanted!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227676: @ 8227676
+SootopolisCity_LotadAndSeedotHouse_Text_PleaseShowMeBigLotad: @ 8227676
 	.string "Do you know the POKéMON LOTAD?\n"
 	.string "It's rarely seen in SOOTOPOLIS.\p"
 	.string "I love, I mean love, big LOTAD!\p"
@@ -172,7 +173,7 @@ SootopolisCity_LotadAndSeedotHouse_Text_227676: @ 8227676
 	.string "Hunh? Do you have a LOTAD?\n"
 	.string "P-p-please show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_22776C: @ 822776C
+SootopolisCity_LotadAndSeedotHouse_Text_WowMightBeBiggerThanSeedot: @ 822776C
 	.string "{STR_VAR_2} inches!\n"
 	.string "Wow, that is big!\p"
 	.string "It might be even bigger than the huge\n"
@@ -180,29 +181,30 @@ SootopolisCity_LotadAndSeedotHouse_Text_22776C: @ 822776C
 	.string "Thanks for showing me!\n"
 	.string "This is my thanks!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_2277F4: @ 82277F4
+@ Unused
+SootopolisCity_LotadAndSeedotHouse_Text_ReceivedPotion2: @ 82277F4
 	.string "{PLAYER} received a POTION.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_22780A: @ 822780A
+SootopolisCity_LotadAndSeedotHouse_Text_BagCrammedFull2: @ 822780A
 	.string "Hunh?\n"
 	.string "Your BAG is crammed full.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_22782A: @ 822782A
+SootopolisCity_LotadAndSeedotHouse_Text_SeenBiggerLotad: @ 822782A
 	.string "{STR_VAR_2} inches?\p"
 	.string "Hmm… I've seen a bigger LOTAD\n"
 	.string "than this one here.$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227867: @ 8227867
+SootopolisCity_LotadAndSeedotHouse_Text_ThatsNotLotad: @ 8227867
 	.string "Well, isn't this something!\n"
 	.string "But it's no LOTAD!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_227896: @ 8227896
+SootopolisCity_LotadAndSeedotHouse_Text_DontHaveBigLotad: @ 8227896
 	.string "Don't you have a big LOTAD?\n"
 	.string "How disappointing…\p"
 	.string "If you get a big LOTAD, please\n"
 	.string "come show me!$"
 
-SootopolisCity_LotadAndSeedotHouse_Text_2278F2: @ 82278F2
+SootopolisCity_LotadAndSeedotHouse_Text_BiggestLotadInHistory: @ 82278F2
 	.string "The biggest LOTAD in history!\n"
 	.string "{STR_VAR_2}'s {STR_VAR_3}-inch colossus!\p"
 	.string "A LOTAD bigger than a SEEDOT\n"
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
index 791b9fdaa..014a07dde 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24",
+      "script": "SootopolisCity_MysteryEventsHouse_1F_EventScript_OldMan",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
index c67533ca6..beb7e2455 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_1F/scripts.inc
@@ -1,240 +1,243 @@
 SootopolisCity_MysteryEventsHouse_1F_MapScripts:: @ 8227953
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_1F_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_1F_OnFrame
 	.byte 0
 
 SootopolisCity_MysteryEventsHouse_1F_OnTransition: @ 822795E
-	setvar VAR_0x8004, 16
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 0
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
-	call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_227991
+	call_if_ne SootopolisCity_MysteryEventsHouse_1F_EventScript_MoveOldManToDoor
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_22797D:: @ 822797D
+SootopolisCity_MysteryEventsHouse_1F_EventScript_SetTrainerVisitingLayout:: @ 822797D
 	setvar VAR_TEMP_1, 1
 	setobjectxyperm 1, 3, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_DOWN
 	setmaplayoutindex LAYOUT_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F_STAIRS_UNBLOCKED
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227991:: @ 8227991
+SootopolisCity_MysteryEventsHouse_1F_EventScript_MoveOldManToDoor:: @ 8227991
 	setobjectxyperm 1, 2, 2
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_MapScript2_22799D: @ 822799D
-	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
-	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7
+SootopolisCity_MysteryEventsHouse_1F_OnFrame: @ 822799D
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
+	map_script_2 VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3, SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle
 	.2byte 0
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
+SootopolisCity_MysteryEventsHouse_1F_EventScript_OldManCommentOnBattle:: @ 82279B7
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs
 	waitmovement 0
-	applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_227A21
+	applymovement 1, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer
 	waitmovement 0
 	copyobjectxytoperm 1
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleLostComment
 	compare VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleTiedComment
 	special LoadPlayerParty
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 0
 	releaseall
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A04:: @ 8227A04
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227DB8, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleWonComment:: @ 8227A04
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_ThatWasSuperlative, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D:: @ 8227A0D
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227E03, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleLostComment:: @ 8227A0D
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_TooBadForYou, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16:: @ 8227A16
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D5B, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_BattleTiedComment:: @ 8227A16
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_BrilliantStandoff, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227A1F: @ 8227A1F
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerExitStairs: @ 8227A1F
 	walk_down
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227A21: @ 8227A21
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManWalkBehindPlayer: @ 8227A21
 	walk_right
 	walk_in_place_fastest_down
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A24:: @ 8227A24
+SootopolisCity_MysteryEventsHouse_1F_EventScript_OldMan:: @ 8227A24
 	lock
 	faceplayer
-	setvar VAR_0x8004, 16
+	setvar VAR_0x8004, FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER
 	special CallFrontierUtilFunc
 	compare VAR_RESULT, 1
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_InvalidVisitingTrainer
 	compare VAR_TEMP_1, 1
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_TrainerVisiting
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227B46, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_InvalidVisitingTrainer:: @ 8227A4E
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
+SootopolisCity_MysteryEventsHouse_1F_EventScript_TrainerVisiting:: @ 8227A58
 	special SavePlayerParty
 	special BufferEReaderTrainerName
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, MSGBOX_YESNO
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_ChallengeVisitingTrainer, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	call SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle
+	call SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty
 	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, MSGBOX_YESNO
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_SaveProgressBeforeBattle, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle
 	special LoadPlayerParty
 	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
+	compare VAR_RESULT, FALSE
+	goto_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle
 	special SavePlayerParty
 	special ReducePlayerPartyToSelectedMons
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, MSGBOX_DEFAULT
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_HopeToSeeGoodMatch, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast
 	compare VAR_FACING, DIR_WEST
-	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22
+	call_if_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest
 	warp MAP_SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_B1F, 255, 3, 1
 	waitstate
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
+SootopolisCity_MysteryEventsHouse_1F_EventScript_DeclineBattle:: @ 8227AE2
 	special LoadPlayerParty
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, MSGBOX_DEFAULT
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_YouWontBattle, MSGBOX_DEFAULT
 	release
 	end
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AEF:: @ 8227AEF
-	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C84, MSGBOX_DEFAULT
+SootopolisCity_MysteryEventsHouse_1F_EventScript_ChooseParty:: @ 8227AEF
+	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3, MSGBOX_DEFAULT
 	fadescreen 1
 	special ChooseHalfPartyForBattle
 	waitstate
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227AFE:: @ 8227AFE
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B34
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementNorth:: @ 8227AFE
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227B10:: @ 8227B10
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B43
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B38
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementEast:: @ 8227B10
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_EventScript_227B22:: @ 8227B22
-	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_227B40
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C
+SootopolisCity_MysteryEventsHouse_1F_EventScript_EnterBasementWest:: @ 8227B22
+	applymovement VAR_LAST_TALKED, SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest
 	waitmovement 0
 	return
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B34: @ 8227B34
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementNorth: @ 8227B34
 	delay_16
 	walk_up
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B38: @ 8227B38
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementEast: @ 8227B38
 	delay_16
 	walk_right
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B3C: @ 8227B3C
+SootopolisCity_MysteryEventsHouse_1F_Movement_PlayerEnterBasementWest: @ 8227B3C
 	delay_16
 	walk_left
 	walk_up
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B40: @ 8227B40
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideLeft: @ 8227B40
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Movement_227B43: @ 8227B43
+SootopolisCity_MysteryEventsHouse_1F_Movement_OldManMoveAsideRight: @ 8227B43
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227B46: @ 8227B46
+SootopolisCity_MysteryEventsHouse_1F_Text_OnlyAmusementWatchingBattles: @ 8227B46
 	.string "When I was young, I traveled the world\n"
 	.string "as a POKéMON TRAINER.\p"
 	.string "Now that I've become an old buzzard,\n"
 	.string "my only amusement is watching young\l"
 	.string "TRAINERS battle.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227BDD: @ 8227BDD
+SootopolisCity_MysteryEventsHouse_1F_Text_DoorAppearsToBeLocked: @ 8227BDD
 	.string "The door appears to be locked.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227BFC: @ 8227BFC
+SootopolisCity_MysteryEventsHouse_1F_Text_ChallengeVisitingTrainer: @ 8227BFC
 	.string "A TRAINER named {STR_VAR_1}\n"
 	.string "is visiting my home.\p"
 	.string "Would you like to challenge\n"
 	.string "{STR_VAR_1}?$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227C44: @ 8227C44
+SootopolisCity_MysteryEventsHouse_1F_Text_YouWontBattle: @ 8227C44
 	.string "You won't battle? I'm disappointed\n"
 	.string "that I can't see you battle…$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227C84: @ 8227C84
+SootopolisCity_MysteryEventsHouse_1F_Text_KeepItTo3On3: @ 8227C84
 	.string "Oh, good, good!\p"
 	.string "But my house isn't all that sturdy.\p"
 	.string "Could I ask you to keep it down to\n"
 	.string "a 3-on-3 match?$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227CEB: @ 8227CEB
+SootopolisCity_MysteryEventsHouse_1F_Text_SaveProgressBeforeBattle: @ 8227CEB
 	.string "Before you two battle, you should\n"
 	.string "save your progress.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227D21: @ 8227D21
+SootopolisCity_MysteryEventsHouse_1F_Text_HopeToSeeGoodMatch: @ 8227D21
 	.string "I hope to see a good match!$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227D3D: @ 8227D3D
+@ Unused
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Tie: @ 8227D3D
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_B1F_Text_227D40: @ 8227D40
+SootopolisCity_MysteryEventsHouse_B1F_Text_MatchEndedUpDraw: @ 8227D40
 	.string "The match ended up a draw.$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227D5B: @ 8227D5B
+SootopolisCity_MysteryEventsHouse_1F_Text_BrilliantStandoff: @ 8227D5B
 	.string "So, it became a standoff.\p"
 	.string "It was a brilliant match in which\n"
 	.string "neither side conceded a step!$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227DB5: @ 8227DB5
+@ Unused
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Won: @ 8227DB5
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227DB8: @ 8227DB8
+SootopolisCity_MysteryEventsHouse_1F_Text_ThatWasSuperlative: @ 8227DB8
 	.string "That was superlative!\p"
 	.string "Why, it was like seeing myself in\n"
 	.string "my youth again!$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227E00: @ 8227E00
+@ Unused
+SootopolisCity_MysteryEventsHouse_1F_Text_StrVar1Lost: @ 8227E00
 	.string "{STR_VAR_1}$"
 
-SootopolisCity_MysteryEventsHouse_1F_Text_227E03: @ 8227E03
+SootopolisCity_MysteryEventsHouse_1F_Text_TooBadForYou: @ 8227E03
 	.string "Ah, too bad for you!\p"
 	.string "But it was a good match.\n"
 	.string "I hope you can win next time.$"
diff --git a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
index 16533649c..9699eb5e8 100644
--- a/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
+++ b/data/maps/SootopolisCity_MysteryEventsHouse_B1F/scripts.inc
@@ -1,19 +1,19 @@
 SootopolisCity_MysteryEventsHouse_B1F_MapScripts:: @ 8227E4F
 	map_script MAP_SCRIPT_ON_TRANSITION, SootopolisCity_MysteryEventsHouse_B1F_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SootopolisCity_MysteryEventsHouse_B1F_OnFrame
 	.byte 0
 
 SootopolisCity_MysteryEventsHouse_B1F_OnTransition: @ 8227E5A
 	special SetEReaderTrainerGfxId
 	end
 
-SootopolisCity_MysteryEventsHouse_B1F_MapScript2_227E5E: @ 8227E5E
-	map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68
+SootopolisCity_MysteryEventsHouse_B1F_OnFrame: @ 8227E5E
+	map_script_2 VAR_TEMP_1, 0, SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer
 	.2byte 0
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleVisitingTrainer:: @ 8227E68
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement
 	waitmovement 0
 	special CopyEReaderTrainerGreeting
 	msgbox gStringVar4, MSGBOX_DEFAULT
@@ -23,14 +23,14 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
 	special DoSpecialTrainerBattle
 	waitstate
 	compare VAR_RESULT, 3
-	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF
+	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleTie
 	compare VAR_RESULT, 1
-	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD
+	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleWon
 	compare VAR_RESULT, 2
-	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8
+	call_if_eq SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost
 	closemessage
 	special HealPlayerParty
-	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9
+	applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement
 	waitmovement 0
 	special LoadPlayerParty
 	setvar VAR_TEMP_1, 1
@@ -39,26 +39,26 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
 	releaseall
 	end
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227ECF:: @ 8227ECF
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleTie:: @ 8227ECF
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 3
-	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_227D40, MSGBOX_DEFAULT
+	msgbox SootopolisCity_MysteryEventsHouse_B1F_Text_MatchEndedUpDraw, MSGBOX_DEFAULT
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EDD:: @ 8227EDD
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleWon:: @ 8227EDD
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 1
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_EventScript_227EE8:: @ 8227EE8
+SootopolisCity_MysteryEventsHouse_B1F_EventScript_BattleLost:: @ 8227EE8
 	setvar VAR_SOOTOPOLIS_MYSTERY_EVENTS_STATE, 2
 	special ShowFieldMessageStringVar4
 	waitmessage
 	waitbuttonpress
 	return
 
-SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3
+SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerEnterBasement: @ 8227EF3
 	walk_down
 	walk_down
 	walk_down
@@ -66,7 +66,7 @@ SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF3: @ 8227EF3
 	walk_right
 	step_end
 
-SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9: @ 8227EF9
+SootopolisCity_MysteryEventsHouse_B1F_Movement_PlayerExitBasement: @ 8227EF9
 	walk_left
 	walk_left
 	walk_up
diff --git a/data/text/berries.inc b/data/text/berries.inc
index 7eeba8e18..349919db0 100644
--- a/data/text/berries.inc
+++ b/data/text/berries.inc
@@ -199,7 +199,7 @@ Route104_PrettyPetalFlowerShop_Text_MachineMixesBerries: @ 82A7AF3
 	.string "for POKéMON.\p"
 	.string "I want some candy, too.$"
 
-SootopolisCity_Text_2A7BB0: @ 82A7BB0
+SootopolisCity_Text_NameIsKiriHaveOneOfThese: @ 82A7BB0
 	.string "Hi, what's your name?\p"
 	.string "… … …  … … …  … … …\n"
 	.string "Okay. That's nice!\p"
@@ -209,26 +209,26 @@ SootopolisCity_Text_2A7BB0: @ 82A7BB0
 	.string "That's what they wished.\p"
 	.string "You can have one of these.$"
 
-SootopolisCity_Text_2A7C7C: @ 82A7C7C
+SootopolisCity_Text_GiveYouThisBerryToo: @ 82A7C7C
 	.string "KIRI will give you this BERRY, too!\n"
 	.string "I really like it lots!$"
 
-SootopolisCity_Text_2A7CB7: @ 82A7CB7
+SootopolisCity_Text_WhatKindOfWishInYourName: @ 82A7CB7
 	.string "I wonder what kind of wish is included\n"
 	.string "in your name.$"
 
-SootopolisCity_Text_2A7CEC: @ 82A7CEC
+SootopolisCity_Text_LikeSeasonBornIn: @ 82A7CEC
 	.string "Spring, summer, autumn, and winter.\p"
 	.string "If you're born in springtime, do you like\n"
 	.string "the spring, and if you're born in the\l"
 	.string "summer, do you like the summer?$"
 
-SootopolisCity_Text_2A7D80: @ 82A7D80
+SootopolisCity_Text_ThenILoveAutumn: @ 82A7D80
 	.string "Then KIRI was born in the autumn,\n"
 	.string "so I love the autumn!\p"
 	.string "Which season do you like?$"
 
-SootopolisCity_Text_2A7DD2: @ 82A7DD2
+SootopolisCity_Text_OhDoesntMatter: @ 82A7DD2
 	.string "Oh…\n"
 	.string "It doesn't matter…\p"
 	.string "There's so much that I want to know…$"