Document Mossdeep scripts

12 files changed, 247 insertions, 246 deletions

diff --git a/data/maps/MossdeepCity/map.json b/data/maps/MossdeepCity/map.json
index 580b4ca62..e3b1af96b 100644
--- a/data/maps/MossdeepCity/map.json
+++ b/data/maps/MossdeepCity/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4AD1",
+      "script": "MossdeepCity_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4AF9",
+      "script": "MossdeepCity_EventScript_ExpertM",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4AB2",
+      "script": "MossdeepCity_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4AF0",
+      "script": "MossdeepCity_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4B02",
+      "script": "MossdeepCity_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4C10",
+      "script": "MossdeepCity_EventScript_Man",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4B0B",
+      "script": "MossdeepCity_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4C26",
+      "script": "MossdeepCity_EventScript_KingsRockBoy",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4C85",
+      "script": "MossdeepCity_EventScript_Scott",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_SCOTT"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 3,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_EventScript_1E4C7C",
+      "script": "MossdeepCity_EventScript_BlackBelt",
       "flag": "0"
     }
   ],
@@ -332,7 +332,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "MossdeepCity_EventScript_1E4B38"
+      "script": "MossdeepCity_EventScript_VisitedMossdeep"
     },
     {
       "type": "trigger",
@@ -341,7 +341,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "MossdeepCity_EventScript_1E4B38"
+      "script": "MossdeepCity_EventScript_VisitedMossdeep"
     },
     {
       "type": "trigger",
@@ -350,7 +350,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "MossdeepCity_EventScript_1E4B38"
+      "script": "MossdeepCity_EventScript_VisitedMossdeep"
     },
     {
       "type": "trigger",
@@ -359,7 +359,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "MossdeepCity_EventScript_1E4B38"
+      "script": "MossdeepCity_EventScript_VisitedMossdeep"
     },
     {
       "type": "trigger",
@@ -368,7 +368,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -377,7 +377,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -386,7 +386,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -395,7 +395,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -404,7 +404,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     },
     {
       "type": "trigger",
@@ -413,7 +413,7 @@
       "elevation": 5,
       "var": "VAR_MOSSDEEP_CITY_STATE",
       "var_value": "1",
-      "script": "MossdeepCity_EventScript_1E4B41"
+      "script": "MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter"
     }
   ],
   "bg_events": [
@@ -423,7 +423,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_EventScript_1E4B26"
+      "script": "MossdeepCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -431,7 +431,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_EventScript_1E4B1D"
+      "script": "MossdeepCity_EventScript_GymSign"
     },
     {
       "type": "sign",
@@ -455,7 +455,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_EventScript_1E4B2F"
+      "script": "MossdeepCity_EventScript_SpaceCenterSign"
     },
     {
       "type": "sign",
@@ -479,7 +479,7 @@
       "y": 21,
       "elevation": 7,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_EventScript_1E4B14"
+      "script": "MossdeepCity_EventScript_WhiteRock"
     }
   ]
 }
diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc
index 0b9da9912..fe12da311 100644
--- a/data/maps/MossdeepCity/scripts.inc
+++ b/data/maps/MossdeepCity/scripts.inc
@@ -10,83 +10,83 @@ MossdeepCity_OnTransition: @ 81E4A9C
 	call_if_set FLAG_SYS_WEATHER_CTRL, Common_EventScript_SetAlternatingWeather
 	end
 
-MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2
+MossdeepCity_EventScript_PokefanF:: @ 81E4AB2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AC7
-	msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_PokefanFMagmaGone
+	msgbox MossdeepCity_Text_SpaceCenterReceivedLetter, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7
-	msgbox MossdeepCity_Text_1E4F15, MSGBOX_DEFAULT
+MossdeepCity_EventScript_PokefanFMagmaGone:: @ 81E4AC7
+	msgbox MossdeepCity_Text_SpaceCenterLaunchingRockets, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1
+MossdeepCity_EventScript_Sailor:: @ 81E4AD1
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AE6
-	msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_SailorMagmaGone
+	msgbox MossdeepCity_Text_MossdeepTargetedByMagma, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4AE6:: @ 81E4AE6
-	msgbox MossdeepCity_Text_1E5051, MSGBOX_DEFAULT
+MossdeepCity_EventScript_SailorMagmaGone:: @ 81E4AE6
+	msgbox MossdeepCity_Text_FeelReliefOnLand, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4AF0:: @ 81E4AF0
-	msgbox MossdeepCity_Text_1E4E22, MSGBOX_NPC
+MossdeepCity_EventScript_NinjaBoy:: @ 81E4AF0
+	msgbox MossdeepCity_Text_WailmerWatching, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4AF9:: @ 81E4AF9
-	msgbox MossdeepCity_Text_1E5135, MSGBOX_NPC
+MossdeepCity_EventScript_ExpertM:: @ 81E4AF9
+	msgbox MossdeepCity_Text_LifeNeedsSeaToLive, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4B02:: @ 81E4B02
-	msgbox MossdeepCity_Text_1E50D9, MSGBOX_NPC
+MossdeepCity_EventScript_Girl:: @ 81E4B02
+	msgbox MossdeepCity_Text_NiceIfWorldCoveredByFlowers, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4B0B:: @ 81E4B0B
-	msgbox MossdeepCity_Text_1E529D, MSGBOX_NPC
+MossdeepCity_EventScript_Woman:: @ 81E4B0B
+	msgbox MossdeepCity_Text_SpecialSpaceCenterRock, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4B14:: @ 81E4B14
-	msgbox MossdeepCity_Text_1E5396, MSGBOX_SIGN
+MossdeepCity_EventScript_WhiteRock:: @ 81E4B14
+	msgbox MossdeepCity_Text_ItsAWhiteRock, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_1E4B1D:: @ 81E4B1D
-	msgbox MossdeepCity_Text_1E53A9, MSGBOX_SIGN
+MossdeepCity_EventScript_GymSign:: @ 81E4B1D
+	msgbox MossdeepCity_Text_GymSign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_1E4B26:: @ 81E4B26
-	msgbox MossdeepCity_Text_1E53F2, MSGBOX_SIGN
+MossdeepCity_EventScript_CitySign:: @ 81E4B26
+	msgbox MossdeepCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_1E4B2F:: @ 81E4B2F
-	msgbox MossdeepCity_Text_1E541F, MSGBOX_SIGN
+MossdeepCity_EventScript_SpaceCenterSign:: @ 81E4B2F
+	msgbox MossdeepCity_Text_SpaceCenterSign, MSGBOX_SIGN
 	end
 
-MossdeepCity_EventScript_1E4B38:: @ 81E4B38
+MossdeepCity_EventScript_VisitedMossdeep:: @ 81E4B38
 	setflag FLAG_VISITED_MOSSDEEP_CITY
 	setvar VAR_TEMP_1, 1
 	end
 
-MossdeepCity_EventScript_1E4B41:: @ 81E4B41
+MossdeepCity_EventScript_TeamMagmaEnterSpaceCenter:: @ 81E4B41
 	lockall
-	applymovement 14, MossdeepCity_Movement_1E4BAD
+	applymovement 14, MossdeepCity_Movement_MaxieGestureToSpaceCenter
 	waitmovement 0
-	applymovement 10, MossdeepCity_Movement_1E4BB7
-	applymovement 11, MossdeepCity_Movement_1E4BB7
-	applymovement 12, MossdeepCity_Movement_1E4BB7
-	applymovement 13, MossdeepCity_Movement_1E4BB7
+	applymovement 10, MossdeepCity_Movement_GruntFaceSpaceCenter
+	applymovement 11, MossdeepCity_Movement_GruntFaceSpaceCenter
+	applymovement 12, MossdeepCity_Movement_GruntFaceSpaceCenter
+	applymovement 13, MossdeepCity_Movement_GruntFaceSpaceCenter
 	waitmovement 0
-	applymovement 14, MossdeepCity_Movement_1E4BBC
-	applymovement 10, MossdeepCity_Movement_1E4BCA
-	applymovement 11, MossdeepCity_Movement_1E4BDD
-	applymovement 12, MossdeepCity_Movement_1E4BEF
-	applymovement 13, MossdeepCity_Movement_1E4C00
+	applymovement 14, MossdeepCity_Movement_MaxieEnterSpaceCenter
+	applymovement 10, MossdeepCity_Movement_Grunt1EnterSpaceCenter
+	applymovement 11, MossdeepCity_Movement_Grunt2EnterSpaceCenter
+	applymovement 12, MossdeepCity_Movement_Grunt3EnterSpaceCenter
+	applymovement 13, MossdeepCity_Movement_Grunt4EnterSpaceCenter
 	waitmovement 0
 	removeobject 14
 	removeobject 10
@@ -99,7 +99,7 @@ MossdeepCity_EventScript_1E4B41:: @ 81E4B41
 	releaseall
 	end
 
-MossdeepCity_Movement_1E4BAD: @ 81E4BAD
+MossdeepCity_Movement_MaxieGestureToSpaceCenter: @ 81E4BAD
 	delay_16
 	face_right
 	delay_16
@@ -111,14 +111,14 @@ MossdeepCity_Movement_1E4BAD: @ 81E4BAD
 	delay_16
 	step_end
 
-MossdeepCity_Movement_1E4BB7: @ 81E4BB7
+MossdeepCity_Movement_GruntFaceSpaceCenter: @ 81E4BB7
 	face_right
 	delay_16
 	delay_16
 	delay_16
 	step_end
 
-MossdeepCity_Movement_1E4BBC: @ 81E4BBC
+MossdeepCity_Movement_MaxieEnterSpaceCenter: @ 81E4BBC
 	walk_down
 	walk_right
 	walk_right
@@ -134,7 +134,7 @@ MossdeepCity_Movement_1E4BBC: @ 81E4BBC
 	walk_right
 	step_end
 
-MossdeepCity_Movement_1E4BCA: @ 81E4BCA
+MossdeepCity_Movement_Grunt1EnterSpaceCenter: @ 81E4BCA
 	delay_16
 	delay_8
 	walk_down
@@ -155,7 +155,7 @@ MossdeepCity_Movement_1E4BCA: @ 81E4BCA
 	walk_right
 	step_end
 
-MossdeepCity_Movement_1E4BDD: @ 81E4BDD
+MossdeepCity_Movement_Grunt2EnterSpaceCenter: @ 81E4BDD
 	delay_16
 	delay_8
 	walk_down
@@ -175,7 +175,7 @@ MossdeepCity_Movement_1E4BDD: @ 81E4BDD
 	walk_right
 	step_end
 
-MossdeepCity_Movement_1E4BEF: @ 81E4BEF
+MossdeepCity_Movement_Grunt3EnterSpaceCenter: @ 81E4BEF
 	delay_16
 	delay_8
 	walk_down
@@ -194,7 +194,7 @@ MossdeepCity_Movement_1E4BEF: @ 81E4BEF
 	walk_right
 	step_end
 
-MossdeepCity_Movement_1E4C00: @ 81E4C00
+MossdeepCity_Movement_Grunt4EnterSpaceCenter: @ 81E4C00
 	delay_16
 	delay_8
 	walk_right
@@ -212,77 +212,77 @@ MossdeepCity_Movement_1E4C00: @ 81E4C00
 	walk_right
 	step_end
 
-MossdeepCity_EventScript_1E4C10:: @ 81E4C10
+MossdeepCity_EventScript_Man:: @ 81E4C10
 	lock
 	faceplayer
-	msgbox MossdeepCity_Text_1E5213, MSGBOX_DEFAULT
+	msgbox MossdeepCity_Text_SurfExhilarating, MSGBOX_DEFAULT
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-MossdeepCity_EventScript_1E4C26:: @ 81E4C26
+MossdeepCity_EventScript_KingsRockBoy:: @ 81E4C26
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_1E4C68
-	msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO
+	goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_ReceivedKingsRock
+	msgbox MossdeepCity_Text_WantKingsRockStevenGaveMe, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq MossdeepCity_EventScript_1E4C72
-	msgbox MossdeepCity_Text_1E4D5B, MSGBOX_DEFAULT
+	goto_if_eq MossdeepCity_EventScript_DeclineKingsRock
+	msgbox MossdeepCity_Text_YouCanKeepIt, MSGBOX_DEFAULT
 	giveitem_std ITEM_KINGS_ROCK
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_KINGS_ROCK
 	release
 	end
 
-MossdeepCity_EventScript_1E4C68:: @ 81E4C68
-	msgbox MossdeepCity_Text_1E4DB3, MSGBOX_DEFAULT
+MossdeepCity_EventScript_ReceivedKingsRock:: @ 81E4C68
+	msgbox MossdeepCity_Text_StevensHouseOverThere, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4C72:: @ 81E4C72
-	msgbox MossdeepCity_Text_1E4DD7, MSGBOX_DEFAULT
+MossdeepCity_EventScript_DeclineKingsRock:: @ 81E4C72
+	msgbox MossdeepCity_Text_WhatToDoWithWeirdRock, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_EventScript_1E4C7C:: @ 81E4C7C
-	msgbox MossdeepCity_Text_1E5581, MSGBOX_NPC
+MossdeepCity_EventScript_BlackBelt:: @ 81E4C7C
+	msgbox MossdeepCity_Text_SootopolisNewGymLeader, MSGBOX_NPC
 	end
 
-MossdeepCity_EventScript_1E4C85:: @ 81E4C85
+MossdeepCity_EventScript_Scott:: @ 81E4C85
 	lock
 	faceplayer
-	msgbox MossdeepCity_Text_1E5453, MSGBOX_DEFAULT
+	msgbox MossdeepCity_Text_ScottSomethingWrongWithTown, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq MossdeepCity_EventScript_1E4CB0
+	call_if_eq MossdeepCity_EventScript_ScottExitNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq MossdeepCity_EventScript_1E4CC2
+	call_if_eq MossdeepCity_EventScript_ScottExitEast
 	addvar VAR_SCOTT_STATE, 1
 	removeobject 16
 	release
 	end
 
-MossdeepCity_EventScript_1E4CB0:: @ 81E4CB0
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4
-	applymovement 16, MossdeepCity_Movement_1E4CD8
+MossdeepCity_EventScript_ScottExitNorth:: @ 81E4CB0
+	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit
+	applymovement 16, MossdeepCity_Movement_ScottExitNorth
 	waitmovement 0
 	return
 
-MossdeepCity_EventScript_1E4CC2:: @ 81E4CC2
-	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_1E4CD4
-	applymovement 16, MossdeepCity_Movement_1E4CE2
+MossdeepCity_EventScript_ScottExitEast:: @ 81E4CC2
+	applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Movement_PlayerWatchScottExit
+	applymovement 16, MossdeepCity_Movement_ScottExitEast
 	waitmovement 0
 	return
 
-MossdeepCity_Movement_1E4CD4: @ 81E4CD4
+MossdeepCity_Movement_PlayerWatchScottExit: @ 81E4CD4
 	delay_16
 	delay_16
 	walk_in_place_fastest_left
 	step_end
 
-MossdeepCity_Movement_1E4CD8: @ 81E4CD8
+MossdeepCity_Movement_ScottExitNorth: @ 81E4CD8
 	walk_left
 	walk_left
 	walk_left
@@ -294,7 +294,7 @@ MossdeepCity_Movement_1E4CD8: @ 81E4CD8
 	walk_left
 	step_end
 
-MossdeepCity_Movement_1E4CE2: @ 81E4CE2
+MossdeepCity_Movement_ScottExitEast: @ 81E4CE2
 	walk_down
 	walk_left
 	walk_left
@@ -307,26 +307,26 @@ MossdeepCity_Movement_1E4CE2: @ 81E4CE2
 	walk_left
 	step_end
 
-MossdeepCity_Text_1E4CED: @ 81E4CED
+MossdeepCity_Text_WantKingsRockStevenGaveMe: @ 81E4CED
 	.string "I got this from STEVEN, but I don't\n"
 	.string "know what it's good for.\p"
 	.string "I think it's called KING'S ROCK.\n"
 	.string "Do you want it?$"
 
-MossdeepCity_Text_1E4D5B: @ 81E4D5B
+MossdeepCity_Text_YouCanKeepIt: @ 81E4D5B
 	.string "Why would you want it?\n"
 	.string "You're weird.\p"
 	.string "You can keep it, but keep it a secret\n"
 	.string "from STEVEN.$"
 
-MossdeepCity_Text_1E4DB3: @ 81E4DB3
+MossdeepCity_Text_StevensHouseOverThere: @ 81E4DB3
 	.string "STEVEN's house is right over there!$"
 
-MossdeepCity_Text_1E4DD7: @ 81E4DD7
+MossdeepCity_Text_WhatToDoWithWeirdRock: @ 81E4DD7
 	.string "Yeah, you think so, too! What are you\n"
 	.string "supposed to do with some weird rock?$"
 
-MossdeepCity_Text_1E4E22: @ 81E4E22
+MossdeepCity_Text_WailmerWatching: @ 81E4E22
 	.string "Around MOSSDEEP, you can see wild\n"
 	.string "WAILMER.\p"
 	.string "It's called, uh…\n"
@@ -334,17 +334,17 @@ MossdeepCity_Text_1E4E22: @ 81E4E22
 	.string "WAI, WAI, WAI…\p"
 	.string "WAILMER watching!$"
 
-MossdeepCity_Text_1E4E90: @ 81E4E90
+MossdeepCity_Text_SpaceCenterReceivedLetter: @ 81E4E90
 	.string "The island's SPACE CENTER has been\n"
 	.string "launching huge rockets.\p"
 	.string "There's been some kind of an uproar\n"
 	.string "over a letter they received recently.$"
 
-MossdeepCity_Text_1E4F15: @ 81E4F15
+MossdeepCity_Text_SpaceCenterLaunchingRockets: @ 81E4F15
 	.string "The island's SPACE CENTER has been\n"
 	.string "launching huge rockets.$"
 
-MossdeepCity_Text_1E4F50: @ 81E4F50
+MossdeepCity_Text_MossdeepTargetedByMagma: @ 81E4F50
 	.string "I heard from a SAILOR buddy that\n"
 	.string "TEAM AQUA set up shop in LILYCOVE.\p"
 	.string "I also heard that someone came along\n"
@@ -354,18 +354,18 @@ MossdeepCity_Text_1E4F50: @ 81E4F50
 	.string "If you want to know what they're up to,\n"
 	.string "go visit the SPACE CENTER.$"
 
-MossdeepCity_Text_1E5051: @ 81E5051
+MossdeepCity_Text_FeelReliefOnLand: @ 81E5051
 	.string "I'm a SAILOR, so the sea's obviously\n"
 	.string "more important to me.\p"
 	.string "But you know? When I get back on land\n"
 	.string "after a long voyage, I do feel relief!$"
 
-MossdeepCity_Text_1E50D9: @ 81E50D9
+MossdeepCity_Text_NiceIfWorldCoveredByFlowers: @ 81E50D9
 	.string "Wouldn't it be nice?\p"
 	.string "If the whole world was covered in\n"
 	.string "plants and flowers like this island?$"
 
-MossdeepCity_Text_1E5135: @ 81E5135
+MossdeepCity_Text_LifeNeedsSeaToLive: @ 81E5135
 	.string "All life needs the sea to live, even\n"
 	.string "though it makes its home on the land.\p"
 	.string "Life, having run its course, becomes\n"
@@ -374,14 +374,14 @@ MossdeepCity_Text_1E5135: @ 81E5135
 	.string "the land.\p"
 	.string "Yes, like the very shoreline here.$"
 
-MossdeepCity_Text_1E5213: @ 81E5213
+MossdeepCity_Text_SurfExhilarating: @ 81E5213
 	.string "A voyage on a ship is fine.\p"
 	.string "But crossing the sea with POKéMON\n"
 	.string "using SURF…\p"
 	.string "Now that's an exhilarating trip!\n"
 	.string "Wouldn't you agree, youngster?$"
 
-MossdeepCity_Text_1E529D: @ 81E529D
+MossdeepCity_Text_SpecialSpaceCenterRock: @ 81E529D
 	.string "This rock has a special meaning to\n"
 	.string "the people at the SPACE CENTER.\p"
 	.string "They put it here as their wish for\n"
@@ -391,23 +391,23 @@ MossdeepCity_Text_1E529D: @ 81E529D
 	.string "I use a wish tag to make it happen.\n"
 	.string "That's what I do.$"
 
-MossdeepCity_Text_1E5396: @ 81E5396
+MossdeepCity_Text_ItsAWhiteRock: @ 81E5396
 	.string "It's a white rock.$"
 
-MossdeepCity_Text_1E53A9: @ 81E53A9
+MossdeepCity_Text_GymSign: @ 81E53A9
 	.string "MOSSDEEP CITY POKéMON GYM\n"
 	.string "LEADERS: LIZA & TATE\p"
 	.string "“The mystic combination!”$"
 
-MossdeepCity_Text_1E53F2: @ 81E53F2
+MossdeepCity_Text_CitySign: @ 81E53F2
 	.string "MOSSDEEP CITY\n"
 	.string "“Our slogan: Cherish POKéMON!”$"
 
-MossdeepCity_Text_1E541F: @ 81E541F
+MossdeepCity_Text_SpaceCenterSign: @ 81E541F
 	.string "MOSSDEEP SPACE CENTER\n"
 	.string "“The closest place to space.”$"
 
-MossdeepCity_Text_1E5453: @ 81E5453
+MossdeepCity_Text_ScottSomethingWrongWithTown: @ 81E5453
 	.string "SCOTT: {PLAYER}{KUN}, feeling good?\n"
 	.string "I'm doing great!\p"
 	.string "I'd heard MOSSDEEP's GYM LEADER is\n"
@@ -420,7 +420,7 @@ MossdeepCity_Text_1E5453: @ 81E5453
 	.string "I don't think it concerns me in any\n"
 	.string "way, though.$"
 
-MossdeepCity_Text_1E5581: @ 81E5581
+MossdeepCity_Text_SootopolisNewGymLeader: @ 81E5581
 	.string "Ahh… It feels great letting the waves\n"
 	.string "wash over my feet…\p"
 	.string "Speaking of the waves, you know that\n"
diff --git a/data/maps/MossdeepCity_House1/map.json b/data/maps/MossdeepCity_House1/map.json
index def086288..6b57ca6ef 100644
--- a/data/maps/MossdeepCity_House1/map.json
+++ b/data/maps/MossdeepCity_House1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House1_EventScript_221FD6",
+      "script": "MossdeepCity_House1_EventScript_BlackBelt",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House1_EventScript_222006",
+      "script": "MossdeepCity_House1_EventScript_Woman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_House1/scripts.inc b/data/maps/MossdeepCity_House1/scripts.inc
index 60d612fb2..3ad07e023 100644
--- a/data/maps/MossdeepCity_House1/scripts.inc
+++ b/data/maps/MossdeepCity_House1/scripts.inc
@@ -1,42 +1,42 @@
 MossdeepCity_House1_MapScripts:: @ 8221FD5
 	.byte 0
 
-MossdeepCity_House1_EventScript_221FD6:: @ 8221FD6
+MossdeepCity_House1_EventScript_BlackBelt:: @ 8221FD6
 	lock
 	faceplayer
 	bufferleadmonspeciesname 0
-	msgbox MossdeepCity_House1_Text_22200F, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House1_Text_HmmYourPokemon, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetPokeblockNameByMonNature
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_House1_EventScript_221FFC
-	msgbox MossdeepCity_House1_Text_22201D, MSGBOX_DEFAULT
+	goto_if_eq MossdeepCity_House1_EventScript_NeutralNature
+	msgbox MossdeepCity_House1_Text_ItLikesXPokeblocks, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House1_EventScript_221FFC:: @ 8221FFC
-	msgbox MossdeepCity_House1_Text_222068, MSGBOX_DEFAULT
+MossdeepCity_House1_EventScript_NeutralNature:: @ 8221FFC
+	msgbox MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House1_EventScript_222006:: @ 8222006
-	msgbox MossdeepCity_House1_Text_222099, MSGBOX_NPC
+MossdeepCity_House1_EventScript_Woman:: @ 8222006
+	msgbox MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes, MSGBOX_NPC
 	end
 
-MossdeepCity_House1_Text_22200F: @ 822200F
+MossdeepCity_House1_Text_HmmYourPokemon: @ 822200F
 	.string "Hmm!\n"
 	.string "Your {STR_VAR_1}…$"
 
-MossdeepCity_House1_Text_22201D: @ 822201D
+MossdeepCity_House1_Text_ItLikesXPokeblocks: @ 822201D
 	.string "It likes {STR_VAR_1}S,\n"
 	.string "doesn't it?\p"
 	.string "No, I'm positive of it! It definitely\n"
 	.string "likes {STR_VAR_1}S!$"
 
-MossdeepCity_House1_Text_222068: @ 8222068
+MossdeepCity_House1_Text_DoesntLikeOrDislikePokeblocks: @ 8222068
 	.string "It doesn't appear to like or dislike\n"
 	.string "any {POKEBLOCK}S.$"
 
-MossdeepCity_House1_Text_222099: @ 8222099
+MossdeepCity_House1_Text_HusbandCanTellPokeblockMonLikes: @ 8222099
 	.string "My husband can tell what kind of\n"
 	.string "{POKEBLOCK}S a POKéMON likes at a glance.$"
 
diff --git a/data/maps/MossdeepCity_House2/map.json b/data/maps/MossdeepCity_House2/map.json
index e63a1aee6..967fc0a55 100644
--- a/data/maps/MossdeepCity_House2/map.json
+++ b/data/maps/MossdeepCity_House2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House2_EventScript_2220DF",
+      "script": "MossdeepCity_House2_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House2_EventScript_2220E8",
+      "script": "MossdeepCity_House2_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House2_EventScript_2220F1",
+      "script": "MossdeepCity_House2_EventScript_Wingull",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL"
     }
   ],
diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc
index 792ee7fd1..8f77aede2 100644
--- a/data/maps/MossdeepCity_House2/scripts.inc
+++ b/data/maps/MossdeepCity_House2/scripts.inc
@@ -1,43 +1,43 @@
 MossdeepCity_House2_MapScripts:: @ 82220DE
 	.byte 0
 
-MossdeepCity_House2_EventScript_2220DF:: @ 82220DF
-	msgbox MossdeepCity_House2_Text_222146, MSGBOX_NPC
+MossdeepCity_House2_EventScript_Man:: @ 82220DF
+	msgbox MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree, MSGBOX_NPC
 	end
 
-MossdeepCity_House2_EventScript_2220E8:: @ 82220E8
-	msgbox MossdeepCity_House2_Text_2221A6, MSGBOX_NPC
+MossdeepCity_House2_EventScript_Twin:: @ 82220E8
+	msgbox MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth, MSGBOX_NPC
 	end
 
-MossdeepCity_House2_EventScript_2220F1:: @ 82220F1
+MossdeepCity_House2_EventScript_Wingull:: @ 82220F1
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox MossdeepCity_House2_Text_22222E, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House2_Text_Wingull, MSGBOX_DEFAULT
 	waitmoncry
 	closemessage
 	setflag FLAG_WINGULL_DELIVERED_MAIL
 	clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq MossdeepCity_House2_EventScript_222124
+	call_if_eq MossdeepCity_House2_EventScript_WingullExitNorth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq MossdeepCity_House2_EventScript_22212F
+	call_if_eq MossdeepCity_House2_EventScript_WingullExitWest
 	removeobject 3
 	release
 	end
 
-MossdeepCity_House2_EventScript_222124:: @ 8222124
-	applymovement 3, MossdeepCity_House2_Movement_22213A
+MossdeepCity_House2_EventScript_WingullExitNorth:: @ 8222124
+	applymovement 3, MossdeepCity_House2_Movement_WingullExitNorth
 	waitmovement 0
 	return
 
-MossdeepCity_House2_EventScript_22212F:: @ 822212F
-	applymovement 3, MossdeepCity_House2_Movement_222141
+MossdeepCity_House2_EventScript_WingullExitWest:: @ 822212F
+	applymovement 3, MossdeepCity_House2_Movement_WingullExitEast
 	waitmovement 0
 	return
 
-MossdeepCity_House2_Movement_22213A: @ 822213A
+MossdeepCity_House2_Movement_WingullExitNorth: @ 822213A
 	walk_fast_right
 	walk_fast_down
 	walk_fast_down
@@ -46,25 +46,25 @@ MossdeepCity_House2_Movement_22213A: @ 822213A
 	delay_8
 	step_end
 
-MossdeepCity_House2_Movement_222141: @ 8222141
+MossdeepCity_House2_Movement_WingullExitEast: @ 8222141
 	walk_fast_down
 	walk_fast_down
 	walk_fast_down
 	delay_8
 	step_end
 
-MossdeepCity_House2_Text_222146: @ 8222146
+MossdeepCity_House2_Text_SisterMailsBoyfriendInFortree: @ 8222146
 	.string "My little sister exchanges MAIL with\n"
 	.string "her boyfriend in FORTREE.\p"
 	.string "I don't envy her one bit at all.$"
 
-MossdeepCity_House2_Text_2221A6: @ 82221A6
+MossdeepCity_House2_Text_PokemonCarriesMailBackAndForth: @ 82221A6
 	.string "Even though I can't see my friend in\n"
 	.string "FORTREE, my POKéMON carries MAIL\l"
 	.string "back and forth for us.\p"
 	.string "I'm not lonesome, even though we're\n"
 	.string "apart.$"
 
-MossdeepCity_House2_Text_22222E: @ 822222E
+MossdeepCity_House2_Text_Wingull: @ 822222E
 	.string "WINGULL: Pihyoh!$"
 
diff --git a/data/maps/MossdeepCity_House3/map.json b/data/maps/MossdeepCity_House3/map.json
index 237a315ff..b2d7cb404 100644
--- a/data/maps/MossdeepCity_House3/map.json
+++ b/data/maps/MossdeepCity_House3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House3_EventScript_2225C3",
+      "script": "MossdeepCity_House3_EventScript_SuperRodFisherman",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc
index 1aa4e85df..96285cf25 100644
--- a/data/maps/MossdeepCity_House3/scripts.inc
+++ b/data/maps/MossdeepCity_House3/scripts.inc
@@ -1,31 +1,31 @@
 MossdeepCity_House3_MapScripts:: @ 82225C2
 	.byte 0
 
-MossdeepCity_House3_EventScript_2225C3:: @ 82225C3
+MossdeepCity_House3_EventScript_SuperRodFisherman:: @ 82225C3
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_222602
-	msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO
+	goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_ReceivedSuperRod
+	msgbox MossdeepCity_House3_Text_YouWantSuperRod, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq MossdeepCity_House3_EventScript_22260C
-	msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT
+	goto_if_eq MossdeepCity_House3_EventScript_DeclineSuperRod
+	msgbox MossdeepCity_House3_Text_SuperRodIsSuper, MSGBOX_DEFAULT
 	giveitem_std ITEM_SUPER_ROD
 	setflag FLAG_RECEIVED_SUPER_ROD
-	msgbox MossdeepCity_House3_Text_2226F0, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House3_Text_TryDroppingRodInWater, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House3_EventScript_222602:: @ 8222602
-	msgbox MossdeepCity_House3_Text_222751, MSGBOX_DEFAULT
+MossdeepCity_House3_EventScript_ReceivedSuperRod:: @ 8222602
+	msgbox MossdeepCity_House3_Text_GoAfterSeafloorPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House3_EventScript_22260C:: @ 822260C
-	msgbox MossdeepCity_House3_Text_222733, MSGBOX_DEFAULT
+MossdeepCity_House3_EventScript_DeclineSuperRod:: @ 822260C
+	msgbox MossdeepCity_House3_Text_DontYouLikeToFish, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House3_Text_222616: @ 8222616
+MossdeepCity_House3_Text_YouWantSuperRod: @ 8222616
 	.string "Hey there, TRAINER!\n"
 	.string "A SUPER ROD really is super!\p"
 	.string "Say all you want, but this baby can\n"
@@ -33,19 +33,19 @@ MossdeepCity_House3_Text_222616: @ 8222616
 	.string "What do you think?\n"
 	.string "You want it, don't you?$"
 
-MossdeepCity_House3_Text_2226B6: @ 82226B6
+MossdeepCity_House3_Text_SuperRodIsSuper: @ 82226B6
 	.string "You bet, you bet!\n"
 	.string "After all, a SUPER ROD is really super!$"
 
-MossdeepCity_House3_Text_2226F0: @ 82226F0
+MossdeepCity_House3_Text_TryDroppingRodInWater: @ 82226F0
 	.string "If there's any water, try dropping in\n"
 	.string "your ROD and see what bites!$"
 
-MossdeepCity_House3_Text_222733: @ 8222733
+MossdeepCity_House3_Text_DontYouLikeToFish: @ 8222733
 	.string "Hunh?\n"
 	.string "Don't you like to fish?$"
 
-MossdeepCity_House3_Text_222751: @ 8222751
+MossdeepCity_House3_Text_GoAfterSeafloorPokemon: @ 8222751
 	.string "Go after the seafloor POKéMON with\n"
 	.string "your SUPER ROD.$"
 
diff --git a/data/maps/MossdeepCity_House4/map.json b/data/maps/MossdeepCity_House4/map.json
index 2d1b33335..7166674a3 100644
--- a/data/maps/MossdeepCity_House4/map.json
+++ b/data/maps/MossdeepCity_House4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House4_EventScript_222DD8",
+      "script": "MossdeepCity_House4_EventScript_Woman",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House4_EventScript_222DF7",
+      "script": "MossdeepCity_House4_EventScript_NinjaBoy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_House4_EventScript_222E1E",
+      "script": "MossdeepCity_House4_EventScript_Skitty",
       "flag": "0"
     }
   ],
diff --git a/data/maps/MossdeepCity_House4/scripts.inc b/data/maps/MossdeepCity_House4/scripts.inc
index 4505b1f03..473c1cfbd 100644
--- a/data/maps/MossdeepCity_House4/scripts.inc
+++ b/data/maps/MossdeepCity_House4/scripts.inc
@@ -1,62 +1,62 @@
 MossdeepCity_House4_MapScripts:: @ 8222DD7
 	.byte 0
 
-MossdeepCity_House4_EventScript_222DD8:: @ 8222DD8
+MossdeepCity_House4_EventScript_Woman:: @ 8222DD8
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_222DED
-	msgbox MossdeepCity_House4_Text_222E31, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_CanBattleAtSecretBases
+	msgbox MossdeepCity_House4_Text_BrotherLikesToFindBases, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_222DED:: @ 8222DED
-	msgbox MossdeepCity_House4_Text_222E73, MSGBOX_DEFAULT
+MossdeepCity_House4_EventScript_CanBattleAtSecretBases:: @ 8222DED
+	msgbox MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_222DF7:: @ 8222DF7
+MossdeepCity_House4_EventScript_NinjaBoy:: @ 8222DF7
 	lock
 	faceplayer
 	special CheckPlayerHasSecretBase
-	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_House4_EventScript_222E14
+	compare VAR_RESULT, FALSE
+	goto_if_eq MossdeepCity_House4_EventScript_NoSecretBase
 	special GetSecretBaseNearbyMapName
-	msgbox MossdeepCity_House4_Text_222ECC, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House4_Text_YouMadeSecretBaseNearX, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_222E14:: @ 8222E14
-	msgbox MossdeepCity_House4_Text_222EF7, MSGBOX_DEFAULT
+MossdeepCity_House4_EventScript_NoSecretBase:: @ 8222E14
+	msgbox MossdeepCity_House4_Text_MakeSecretBase, MSGBOX_DEFAULT
 	release
 	end
 
-MossdeepCity_House4_EventScript_222E1E:: @ 8222E1E
+MossdeepCity_House4_EventScript_Skitty:: @ 8222E1E
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox MossdeepCity_House4_Text_222F31, MSGBOX_DEFAULT
+	msgbox MossdeepCity_House4_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-MossdeepCity_House4_Text_222E31: @ 8222E31
+MossdeepCity_House4_Text_BrotherLikesToFindBases: @ 8222E31
 	.string "My little brother says he likes to go\n"
 	.string "find people's SECRET BASES.$"
 
-MossdeepCity_House4_Text_222E73: @ 8222E73
+MossdeepCity_House4_Text_BrotherLikesToVisitBasesAndBattle: @ 8222E73
 	.string "My little brother says he likes to\n"
 	.string "visit people's SECRET BASES and have\l"
 	.string "POKéMON battles.$"
 
-MossdeepCity_House4_Text_222ECC: @ 8222ECC
+MossdeepCity_House4_Text_YouMadeSecretBaseNearX: @ 8222ECC
 	.string "Was it you who made a SECRET BASE\n"
 	.string "near {STR_VAR_1}?$"
 
-MossdeepCity_House4_Text_222EF7: @ 8222EF7
+MossdeepCity_House4_Text_MakeSecretBase: @ 8222EF7
 	.string "You should make a SECRET BASE\n"
 	.string "somewhere. I'll go find it!$"
 
-MossdeepCity_House4_Text_222F31: @ 8222F31
+MossdeepCity_House4_Text_Skitty: @ 8222F31
 	.string "SKITTY: Miyaan?$"
 
diff --git a/data/maps/MossdeepCity_StevensHouse/map.json b/data/maps/MossdeepCity_StevensHouse/map.json
index 76844e258..c061999ef 100644
--- a/data/maps/MossdeepCity_StevensHouse/map.json
+++ b/data/maps/MossdeepCity_StevensHouse/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_StevensHouse_EventScript_222912",
+      "script": "MossdeepCity_StevensHouse_EventScript_Steven",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_StevensHouse_EventScript_222841",
+      "script": "MossdeepCity_StevensHouse_EventScript_BeldumPokeball",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "MossdeepCity_StevensHouse_EventScript_22291B",
+      "script": "MossdeepCity_StevensHouse_EventScript_Letter",
       "flag": "FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_INVISIBLE_NINJA_BOY"
     }
   ],
@@ -78,7 +78,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+      "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay"
     },
     {
       "type": "sign",
@@ -86,7 +86,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+      "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay"
     },
     {
       "type": "sign",
@@ -94,7 +94,7 @@
       "y": 4,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+      "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay"
     },
     {
       "type": "sign",
@@ -102,7 +102,7 @@
       "y": 6,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "MossdeepCity_StevensHouse_EventScript_222909"
+      "script": "MossdeepCity_StevensHouse_EventScript_RockDisplay"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc
index 247bdc485..c14314b16 100644
--- a/data/maps/MossdeepCity_StevensHouse/scripts.inc
+++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc
@@ -1,32 +1,32 @@
 MossdeepCity_StevensHouse_MapScripts:: @ 8222784
-	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_MapScript1_222794
+	map_script MAP_SCRIPT_ON_LOAD, MossdeepCity_StevensHouse_OnLoad
 	map_script MAP_SCRIPT_ON_TRANSITION, MossdeepCity_StevensHouse_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_MapScript2_2227C0
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, MossdeepCity_StevensHouse_OnFrame
 	.byte 0
 
-MossdeepCity_StevensHouse_MapScript1_222794: @ 8222794
-	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_22279E
+MossdeepCity_StevensHouse_OnLoad: @ 8222794
+	call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_HideStevensNote
 	end
 
-MossdeepCity_StevensHouse_EventScript_22279E:: @ 822279E
+MossdeepCity_StevensHouse_EventScript_HideStevensNote:: @ 822279E
 	setmetatile 6, 4, METATILE_GenericBuilding_TableEdge, 1
 	return
 
 MossdeepCity_StevensHouse_OnTransition: @ 82227A8
 	compare VAR_STEVENS_HOUSE_STATE, 2
-	call_if_eq MossdeepCity_StevensHouse_EventScript_2227B4
+	call_if_eq MossdeepCity_StevensHouse_EventScript_SetStevenPos
 	end
 
-MossdeepCity_StevensHouse_EventScript_2227B4:: @ 82227B4
+MossdeepCity_StevensHouse_EventScript_SetStevenPos:: @ 82227B4
 	setobjectxyperm 1, 6, 5
 	setobjectmovementtype 1, MOVEMENT_TYPE_FACE_UP
 	return
 
-MossdeepCity_StevensHouse_MapScript2_2227C0: @ 82227C0
-	map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_2227CA
+MossdeepCity_StevensHouse_OnFrame: @ 82227C0
+	map_script_2 VAR_STEVENS_HOUSE_STATE, 1, MossdeepCity_StevensHouse_EventScript_StevenGivesDive
 	.2byte 0
 
-MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
+MossdeepCity_StevensHouse_EventScript_StevenGivesDive:: @ 82227CA
 	lockall
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
@@ -35,16 +35,16 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	waitmovement 0
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	applymovement 1, MossdeepCity_StevensHouse_Movement_222833
+	applymovement 1, MossdeepCity_StevensHouse_Movement_StevenApproachPlayer
 	waitmovement 0
-	msgbox MossdeepCity_StevensHouse_Text_222936, MSGBOX_DEFAULT
+	msgbox MossdeepCity_StevensHouse_Text_YouveEarnedHMDive, MSGBOX_DEFAULT
 	giveitem_std ITEM_HM08
 	setflag FLAG_RECEIVED_HM08
 	setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER
-	msgbox MossdeepCity_StevensHouse_Text_222A0E, MSGBOX_DEFAULT
+	msgbox MossdeepCity_StevensHouse_Text_ExplainDive, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	applymovement 1, MossdeepCity_StevensHouse_Movement_22283B
+	applymovement 1, MossdeepCity_StevensHouse_Movement_StevenReturn
 	waitmovement 0
 	setflag FLAG_HIDE_MOSSDEEP_CITY_SCOTT
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ENTRANCE_AQUA_GRUNT
@@ -52,7 +52,7 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_Movement_222833: @ 8222833
+MossdeepCity_StevensHouse_Movement_StevenApproachPlayer: @ 8222833
 	walk_left
 	walk_left
 	walk_left
@@ -62,7 +62,7 @@ MossdeepCity_StevensHouse_Movement_222833: @ 8222833
 	walk_in_place_fastest_down
 	step_end
 
-MossdeepCity_StevensHouse_Movement_22283B: @ 822283B
+MossdeepCity_StevensHouse_Movement_StevenReturn: @ 822283B
 	walk_up
 	walk_right
 	walk_right
@@ -70,89 +70,90 @@ MossdeepCity_StevensHouse_Movement_22283B: @ 822283B
 	walk_in_place_fastest_up
 	step_end
 
-MossdeepCity_StevensHouse_EventScript_222841:: @ 8222841
+MossdeepCity_StevensHouse_EventScript_BeldumPokeball:: @ 8222841
 	lockall
-	msgbox MossdeepCity_StevensHouse_Text_222B9E, MSGBOX_YESNO
+	msgbox MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_22285B
-	goto MossdeepCity_StevensHouse_EventScript_222865
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_LeaveBeldum
+	goto MossdeepCity_StevensHouse_EventScript_GiveBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_22285B:: @ 822285B
-	msgbox MossdeepCity_StevensHouse_Text_222C2A, MSGBOX_DEFAULT
+MossdeepCity_StevensHouse_EventScript_LeaveBeldum:: @ 822285B
+	msgbox MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_EventScript_222865:: @ 8222865
+MossdeepCity_StevensHouse_EventScript_GiveBeldum:: @ 8222865
 	setvar VAR_TEMP_1, SPECIES_BELDUM
 	givemon SPECIES_BELDUM, 5, ITEM_NONE
 	compare VAR_RESULT, 0
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_222895
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_SendBeldumParty
 	compare VAR_RESULT, 1
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_2228BD
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_SendBeldumPC
 	goto Common_EventScript_NoMoreRoomForPokemon
 	end
 
-MossdeepCity_StevensHouse_EventScript_222895:: @ 8222895
-	call MossdeepCity_StevensHouse_EventScript_2228EB
+MossdeepCity_StevensHouse_EventScript_SendBeldumParty:: @ 8222895
+	call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_222901
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
 	call Common_EventScript_GetGiftMonPartySlot
 	call Common_EventScript_NameReceivedPartyMon
-	goto MossdeepCity_StevensHouse_EventScript_222901
+	goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_2228BD:: @ 82228BD
-	call MossdeepCity_StevensHouse_EventScript_2228EB
+MossdeepCity_StevensHouse_EventScript_SendBeldumPC:: @ 82228BD
+	call MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare
 	msgbox gText_NicknameThisPokemon, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq MossdeepCity_StevensHouse_EventScript_2228E0
+	goto_if_eq MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC
 	call Common_EventScript_NameReceivedBoxMon
-	goto MossdeepCity_StevensHouse_EventScript_2228E0
+	goto MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC
 	end
 
-MossdeepCity_StevensHouse_EventScript_2228E0:: @ 82228E0
+MossdeepCity_StevensHouse_EventScript_BeldumTransferredToPC:: @ 82228E0
 	call Common_EventScript_TransferredToPC
-	goto MossdeepCity_StevensHouse_EventScript_222901
+	goto MossdeepCity_StevensHouse_EventScript_ReceivedBeldum
 	end
 
-MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB
+MossdeepCity_StevensHouse_EventScript_ReceivedBeldumFanfare:: @ 82228EB
 	bufferspeciesname 1, SPECIES_BELDUM
 	removeobject 2
 	playfanfare MUS_FANFA4
-	message MossdeepCity_StevensHouse_Text_222BED
+	message MossdeepCity_StevensHouse_Text_ObtainedBeldum
 	waitmessage
 	waitfanfare
 	bufferspeciesname 0, SPECIES_BELDUM
 	return
 
-MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901
+MossdeepCity_StevensHouse_EventScript_ReceivedBeldum:: @ 8222901
 	setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL
 	setflag FLAG_RECEIVED_BELDUM
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_EventScript_222909:: @ 8222909
-	msgbox MossdeepCity_StevensHouse_Text_222D97, MSGBOX_SIGN
+MossdeepCity_StevensHouse_EventScript_RockDisplay:: @ 8222909
+	msgbox MossdeepCity_StevensHouse_Text_CollectionOfRareRocks, MSGBOX_SIGN
 	end
 
-MossdeepCity_StevensHouse_EventScript_222912:: @ 8222912
-	msgbox MossdeepCity_StevensHouse_Text_222B11, MSGBOX_NPC
+MossdeepCity_StevensHouse_EventScript_Steven:: @ 8222912
+	msgbox MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis, MSGBOX_NPC
 	end
 
-MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B
+MossdeepCity_StevensHouse_EventScript_Letter:: @ 822291B
 	lockall
-	msgbox MossdeepCity_StevensHouse_Text_222C4E, MSGBOX_DEFAULT
+	msgbox MossdeepCity_StevensHouse_Text_LetterFromSteven, MSGBOX_DEFAULT
 	releaseall
 	end
 
-MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926
+@ Unused, leftover from RS
+MossdeepCity_StevensHouse_EventScript_DiveItemBall:: @ 8222926
 	giveitem_std ITEM_HM08, 1, 1
 	setflag FLAG_RECEIVED_HM08
 	end
 
-MossdeepCity_StevensHouse_Text_222936: @ 8222936
+MossdeepCity_StevensHouse_Text_YouveEarnedHMDive: @ 8222936
 	.string "STEVEN: {PLAYER}{KUN}…\p"
 	.string "As you can see, there's not much here,\n"
 	.string "but this is my home.\p"
@@ -162,7 +163,7 @@ MossdeepCity_StevensHouse_Text_222936: @ 8222936
 	.string "No need to be shy--you've earned\n"
 	.string "this HM.$"
 
-MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E
+MossdeepCity_StevensHouse_Text_ExplainDive: @ 8222A0E
 	.string "STEVEN: While you're using SURF, you\n"
 	.string "should notice dark patches of water.\p"
 	.string "Use DIVE if you come to deep water\n"
@@ -172,30 +173,30 @@ MossdeepCity_StevensHouse_Text_222A0E: @ 8222A0E
 	.string "In some places, it won't be possible\n"
 	.string "for you to surface, though.$"
 
-MossdeepCity_StevensHouse_Text_222B11: @ 8222B11
+MossdeepCity_StevensHouse_Text_UnderwateCavernBetweenMossdeepSootopolis: @ 8222B11
 	.string "STEVEN: Apparently, there's an\n"
 	.string "underwater cavern between\l"
 	.string "MOSSDEEP and SOOTOPOLIS.\p"
 	.string "You know, the one that CAPT. STERN\n"
 	.string "found in his submarine.$"
 
-MossdeepCity_StevensHouse_Text_222B9E: @ 8222B9E
+MossdeepCity_StevensHouse_Text_TakeBallContainingBeldum: @ 8222B9E
 	.string "{PLAYER} checked the POKé BALL.\p"
 	.string "It contained the POKéMON\n"
 	.string "BELDUM.\p"
 	.string "Take the POKé BALL?$"
 
-MossdeepCity_StevensHouse_Text_222BED: @ 8222BED
+MossdeepCity_StevensHouse_Text_ObtainedBeldum: @ 8222BED
 	.string "{PLAYER} obtained a BELDUM.$"
 
 MossdeepCity_StevensHouse_Text_222C03: @ 8222C03
 	.string "There is no space for another POKéMON.$"
 
-MossdeepCity_StevensHouse_Text_222C2A: @ 8222C2A
+MossdeepCity_StevensHouse_Text_LeftPokeBallWhereItWas: @ 8222C2A
 	.string "{PLAYER} left the POKé BALL where\n"
 	.string "it was.$"
 
-MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E
+MossdeepCity_StevensHouse_Text_LetterFromSteven: @ 8222C4E
 	.string "It's a letter.\p"
 	.string "… … … … … …\p"
 	.string "To {PLAYER}{KUN}…\p"
@@ -212,7 +213,7 @@ MossdeepCity_StevensHouse_Text_222C4E: @ 8222C4E
 	.string "May our paths cross someday.\p"
 	.string "STEVEN STONE$"
 
-MossdeepCity_StevensHouse_Text_222D97: @ 8222D97
+MossdeepCity_StevensHouse_Text_CollectionOfRareRocks: @ 8222D97
 	.string "It's a collection of rare rocks and\n"
 	.string "stones assembled by STEVEN.$"