Document Slateport scripts

24 files changed, 926 insertions, 927 deletions

diff --git a/asm/berry_crush.s b/asm/berry_crush.s
index 8d44c7269..b6d07662e 100755
--- a/asm/berry_crush.s
+++ b/asm/berry_crush.s
@@ -1223,8 +1223,8 @@ _080224C0:
 	bx r0
 	thumb_func_end sub_8022250
 
-	thumb_func_start sub_80224D0
-sub_80224D0: @ 80224D0
+	thumb_func_start ShowBerryCrushRankings
+ShowBerryCrushRankings: @ 80224D0
 	push {lr}
 	bl ScriptContext2_Enable
 	ldr r0, =sub_8022250
@@ -1259,7 +1259,7 @@ sub_80224D0: @ 80224D0
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80224D0
+	thumb_func_end ShowBerryCrushRankings
 
 	thumb_func_start sub_8022524
 sub_8022524: @ 8022524
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 03caecd62..fba1cce26 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -206,12 +206,12 @@ gStdScripts_End:: @ 81DC2CC
 	.include "data/maps/SlateportCity_BattleTentLobby/scripts.inc"
 	.include "data/maps/SlateportCity_BattleTentCorridor/scripts.inc"
 	.include "data/maps/SlateportCity_BattleTentBattleRoom/scripts.inc"
-	.include "data/maps/SlateportCity_House1/scripts.inc"
+	.include "data/maps/SlateportCity_NameRatersHouse/scripts.inc"
 	.include "data/maps/SlateportCity_PokemonFanClub/scripts.inc"
 	.include "data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc"
 	.include "data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc"
 	.include "data/maps/SlateportCity_Harbor/scripts.inc"
-	.include "data/maps/SlateportCity_House2/scripts.inc"
+	.include "data/maps/SlateportCity_House/scripts.inc"
 	.include "data/maps/SlateportCity_PokemonCenter_1F/scripts.inc"
 	.include "data/maps/SlateportCity_PokemonCenter_2F/scripts.inc"
 	.include "data/maps/SlateportCity_Mart/scripts.inc"
diff --git a/data/maps/SlateportCity/map.json b/data/maps/SlateportCity/map.json
index f548b7349..53c482597 100644
--- a/data/maps/SlateportCity/map.json
+++ b/data/maps/SlateportCity/map.json
@@ -40,7 +40,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCED9",
+      "script": "SlateportCity_EventScript_FatMan",
       "flag": "0"
     },
     {
@@ -53,7 +53,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCEF6",
+      "script": "SlateportCity_EventScript_Man1",
       "flag": "0"
     },
     {
@@ -66,7 +66,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCEB8",
+      "script": "SlateportCity_EventScript_RichBoy",
       "flag": "0"
     },
     {
@@ -79,7 +79,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCF17",
+      "script": "SlateportCity_EventScript_Woman1",
       "flag": "0"
     },
     {
@@ -92,7 +92,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD009",
+      "script": "SlateportCity_EventScript_AquaGrunt1",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -105,7 +105,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCE42",
+      "script": "SlateportCity_EventScript_Cook",
       "flag": "0"
     },
     {
@@ -118,7 +118,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCE63",
+      "script": "SlateportCity_EventScript_OldWoman",
       "flag": "0"
     },
     {
@@ -131,7 +131,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCE84",
+      "script": "SlateportCity_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -144,7 +144,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD353",
+      "script": "SlateportCity_EventScript_Ty",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
     },
     {
@@ -157,7 +157,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD35C",
+      "script": "SlateportCity_EventScript_Gabby",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY"
     },
     {
@@ -170,7 +170,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD1F8",
+      "script": "SlateportCity_EventScript_CaptStern",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN"
     },
     {
@@ -183,7 +183,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFE5",
+      "script": "SlateportCity_EventScript_Sailor1",
       "flag": "0"
     },
     {
@@ -196,7 +196,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFEE",
+      "script": "SlateportCity_EventScript_Sailor2",
       "flag": "0"
     },
     {
@@ -209,7 +209,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFF7",
+      "script": "SlateportCity_EventScript_PokefanF",
       "flag": "0"
     },
     {
@@ -222,7 +222,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD000",
+      "script": "SlateportCity_EventScript_Man2",
       "flag": "0"
     },
     {
@@ -235,7 +235,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFBB",
+      "script": "SlateportCity_EventScript_Maniac",
       "flag": "0"
     },
     {
@@ -248,7 +248,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCFDC",
+      "script": "SlateportCity_EventScript_Woman2",
       "flag": "0"
     },
     {
@@ -261,7 +261,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD020",
+      "script": "SlateportCity_EventScript_AquaGrunt2",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -274,7 +274,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD037",
+      "script": "SlateportCity_EventScript_AquaGrunt3",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -287,7 +287,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD198",
+      "script": "SlateportCity_EventScript_DecorClerk",
       "flag": "0"
     },
     {
@@ -300,7 +300,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD16A",
+      "script": "SlateportCity_EventScript_DollClerk",
       "flag": "0"
     },
     {
@@ -313,7 +313,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD365",
+      "script": "SlateportCity_EventScript_Man3",
       "flag": "0"
     },
     {
@@ -326,7 +326,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCDE4",
+      "script": "SlateportCity_EventScript_EffortRibbonWoman",
       "flag": "0"
     },
     {
@@ -339,7 +339,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD1D8",
+      "script": "SlateportCity_EventScript_PowerTMClerk",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN"
     },
     {
@@ -352,7 +352,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DCDBD",
+      "script": "SlateportCity_EventScript_EnergyGuru",
       "flag": "0"
     },
     {
@@ -365,7 +365,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD04E",
+      "script": "SlateportCity_EventScript_AquaGrunt4",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -378,7 +378,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD065",
+      "script": "SlateportCity_EventScript_AquaGrunt5",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -391,7 +391,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD07C",
+      "script": "SlateportCity_EventScript_AquaGrunt6",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -404,7 +404,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD093",
+      "script": "SlateportCity_EventScript_AquaGrunt7",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -417,7 +417,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD0AA",
+      "script": "SlateportCity_EventScript_AquaGrunt8",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -430,7 +430,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD0C1",
+      "script": "SlateportCity_EventScript_AquaGrunt9",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -443,7 +443,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD14A",
+      "script": "SlateportCity_EventScript_AquaGrunt10",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -456,7 +456,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD153",
+      "script": "SlateportCity_EventScript_AquaGrunt11",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA"
     },
     {
@@ -469,7 +469,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_EventScript_1DD36E",
+      "script": "SlateportCity_EventScript_BerryPowderClerk",
       "flag": "0"
     },
     {
@@ -533,7 +533,7 @@
       "x": 5,
       "y": 19,
       "elevation": 0,
-      "dest_map": "MAP_SLATEPORT_CITY_HOUSE1",
+      "dest_map": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE",
       "dest_warp_id": 0
     },
     {
@@ -561,7 +561,7 @@
       "x": 21,
       "y": 44,
       "elevation": 0,
-      "dest_map": "MAP_SLATEPORT_CITY_HOUSE2",
+      "dest_map": "MAP_SLATEPORT_CITY_HOUSE",
       "dest_warp_id": 0
     }
   ],
@@ -573,7 +573,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE",
       "var_value": "2",
-      "script": "SlateportCity_EventScript_1DD5DC"
+      "script": "SlateportCity_EventScript_ScottBattleTentScene"
     }
   ],
   "bg_events": [
@@ -583,7 +583,7 @@
       "y": 19,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCFB2"
+      "script": "SlateportCity_EventScript_NameRatersHouseSign"
     },
     {
       "type": "sign",
@@ -615,7 +615,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF94"
+      "script": "SlateportCity_EventScript_HarborSign"
     },
     {
       "type": "sign",
@@ -631,7 +631,7 @@
       "y": 51,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF8B"
+      "script": "SlateportCity_EventScript_MarketSign"
     },
     {
       "type": "sign",
@@ -639,7 +639,7 @@
       "y": 26,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF79"
+      "script": "SlateportCity_EventScript_OceanicMuseumSign"
     },
     {
       "type": "sign",
@@ -647,7 +647,7 @@
       "y": 22,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF82"
+      "script": "SlateportCity_EventScript_CitySign"
     },
     {
       "type": "sign",
@@ -655,7 +655,7 @@
       "y": 26,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF70"
+      "script": "SlateportCity_EventScript_PokemonFanClubSign"
     },
     {
       "type": "sign",
@@ -663,7 +663,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF36"
+      "script": "SlateportCity_EventScript_BattleTentSign"
     },
     {
       "type": "sign",
@@ -671,7 +671,7 @@
       "y": 38,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SlateportCity_EventScript_1DCF3F"
+      "script": "SlateportCity_EventScript_SternsShipyardSign"
     },
     {
       "type": "sign",
@@ -679,7 +679,7 @@
       "y": 36,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SlateportCity_EventScript_1DD643"
+      "script": "SlateportCity_EventScript_BerryCrushRankingsSign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc
index ee9c0c176..83dd8b420 100644
--- a/data/maps/SlateportCity/scripts.inc
+++ b/data/maps/SlateportCity/scripts.inc
@@ -1,24 +1,24 @@
 SlateportCity_MapScripts:: @ 81DCC61
 	map_script MAP_SCRIPT_ON_TRANSITION, SlateportCity_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_MapScript2_1DCD12
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SlateportCity_OnFrame
 	.byte 0
 
 SlateportCity_OnTransition: @ 81DCC6C
 	setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0
-	call SlateportCity_EventScript_1DCC8D
+	call SlateportCity_EventScript_EnterSlateport
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCC99
+	call_if_eq SlateportCity_EventScript_MovePeopleForSternInterview
 	compare VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCCE7
+	call_if_eq SlateportCity_EventScript_SetReadyForScottScene
 	end
 
-SlateportCity_EventScript_1DCC8D:: @ 81DCC8D
+SlateportCity_EventScript_EnterSlateport:: @ 81DCC8D
 	setflag FLAG_VISITED_SLATEPORT_CITY
 	setvar VAR_LINK_CONTEST_ROOM_STATE, 0
 	setflag FLAG_HIDE_SLATEPORT_CITY_CONTEST_REPORTER
 	return
 
-SlateportCity_EventScript_1DCC99:: @ 81DCC99
+SlateportCity_EventScript_MovePeopleForSternInterview:: @ 81DCC99
 	setobjectxyperm 11, 28, 13
 	setobjectxyperm 7, 25, 13
 	setobjectxyperm 3, 25, 14
@@ -35,50 +35,50 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
 	setobjectmovementtype 2, MOVEMENT_TYPE_FACE_LEFT
 	return
 
-SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
+SlateportCity_EventScript_SetReadyForScottScene:: @ 81DCCE7
 	setflag FLAG_HIDE_MAP_NAME_POPUP
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 30
-	goto_if_eq SlateportCity_EventScript_1DCD06
+	goto_if_eq SlateportCity_EventScript_MoveScottLeft
 	setobjectxyperm 35, 23, 27
 	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SlateportCity_EventScript_1DCD06:: @ 81DCD06
+SlateportCity_EventScript_MoveScottLeft:: @ 81DCD06
 	setobjectxyperm 35, 22, 27
 	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_RIGHT
 	return
 
-SlateportCity_MapScript2_1DCD12: @ 81DCD12
-	map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_1DCD1C
+SlateportCity_OnFrame: @ 81DCD12
+	map_script_2 VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 1, SlateportCity_EventScript_ScottScene
 	.2byte 0
 
-SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
+SlateportCity_EventScript_ScottScene:: @ 81DCD1C
 	lockall
 	addobject 35
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DCDA8
-	applymovement 35, SlateportCity_Movement_1DCDAC
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceScott
+	applymovement 35, SlateportCity_Movement_ScottApproachPlayer
 	waitmovement 0
-	msgbox SlateportCity_Text_1DF032, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_YouDroveTeamAquaAway, MSGBOX_DEFAULT
 	closemessage
 	applymovement 35, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	delay 60
-	msgbox SlateportCity_Text_1DF0FE, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_MaybeThisTrainer, MSGBOX_DEFAULT
 	applymovement 35, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox SlateportCity_Text_1DF12B, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_LetsRegisterEachOther, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox SlateportCity_Text_1DF1A6, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_RegisteredScott, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
 	setflag FLAG_ENABLE_SCOTT_MATCH_CALL
-	msgbox SlateportCity_Text_1DF1D3, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou, MSGBOX_DEFAULT
 	closemessage
-	applymovement 35, SlateportCity_Movement_1DCDB4
+	applymovement 35, SlateportCity_Movement_ScottExit
 	waitmovement 0
 	removeobject 35
 	setobjectxyperm 35, 10, 12
@@ -89,13 +89,13 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
 	releaseall
 	end
 
-SlateportCity_Movement_1DCDA8: @ 81DCDA8
+SlateportCity_Movement_PlayerFaceScott: @ 81DCDA8
 	delay_16
 	delay_8
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_1DCDAC: @ 81DCDAC
+SlateportCity_Movement_ScottApproachPlayer: @ 81DCDAC
 	walk_right
 	walk_right
 	walk_right
@@ -105,7 +105,7 @@ SlateportCity_Movement_1DCDAC: @ 81DCDAC
 	walk_right
 	step_end
 
-SlateportCity_Movement_1DCDB4: @ 81DCDB4
+SlateportCity_Movement_ScottExit: @ 81DCDB4
 	walk_left
 	walk_left
 	walk_left
@@ -116,17 +116,17 @@ SlateportCity_Movement_1DCDB4: @ 81DCDB4
 	walk_left
 	step_end
 
-SlateportCity_EventScript_1DCDBD:: @ 81DCDBD
+SlateportCity_EventScript_EnergyGuru:: @ 81DCDBD
 	lock
 	faceplayer
-	message SlateportCity_Text_1DD64A
+	message SlateportCity_Text_EnergyGuruSellWhatYouNeed
 	waitmessage
-	pokemart SlateportCity_Pokemart_1DCDD4
+	pokemart SlateportCity_Pokemart_EnergyGuru
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Pokemart_1DCDD4: @ 81DCDD4
+SlateportCity_Pokemart_EnergyGuru: @ 81DCDD4
 	.2byte ITEM_PROTEIN
 	.2byte ITEM_IRON
 	.2byte ITEM_CARBOS
@@ -137,304 +137,305 @@ SlateportCity_Pokemart_1DCDD4: @ 81DCDD4
 	release
 	end
 
-SlateportCity_EventScript_1DCDE4:: @ 81DCDE4
+SlateportCity_EventScript_EffortRibbonWoman:: @ 81DCDE4
 	lock
 	faceplayer
 	bufferleadmonspeciesname 0
-	msgbox SlateportCity_Text_1DD68A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_OhYourPokemon, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, LeadMonHasEffortRibbon
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_EventScript_1DCE38
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_EventScript_MonHasEffortRibbon
 	specialvar VAR_RESULT, Special_AreLeadMonEVsMaxedOut
-	compare VAR_RESULT, 0
-	call_if_eq SlateportCity_EventScript_1DCE2E
-	msgbox SlateportCity_Text_1DD697, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq SlateportCity_EventScript_MonEVsNotMaxed
+	msgbox SlateportCity_Text_PleaseGiveItThisEffortRibbon, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA4
-	message SlateportCity_Text_1DD6E3
+	message SlateportCity_Text_ReceivedEffortRibbon
 	waitfanfare
-	msgbox SlateportCity_Text_1DD702, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_PutEffortRibbonOnMon, MSGBOX_DEFAULT
 	special GiveLeadMonEffortRibbon
 	release
 	end
 
-SlateportCity_EventScript_1DCE2E:: @ 81DCE2E
-	msgbox SlateportCity_Text_1DD722, MSGBOX_DEFAULT
+SlateportCity_EventScript_MonEVsNotMaxed:: @ 81DCE2E
+	msgbox SlateportCity_Text_GoForItLittleHarder, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE38:: @ 81DCE38
-	msgbox SlateportCity_Text_1DD77B, MSGBOX_DEFAULT
+SlateportCity_EventScript_MonHasEffortRibbon:: @ 81DCE38
+	msgbox SlateportCity_Text_EffortRibbonLooksGoodOnIt, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE42:: @ 81DCE42
+SlateportCity_EventScript_Cook:: @ 81DCE42
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCE59
-	msgbox SlateportCity_Text_1DD81A, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_CookSternInterview
+	msgbox SlateportCity_Text_SeaweedFullOfLife, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE59:: @ 81DCE59
-	msgbox SlateportCity_Text_1DE3E2, MSGBOX_DEFAULT
+SlateportCity_EventScript_CookSternInterview:: @ 81DCE59
+	msgbox SlateportCity_Text_CaptainComeBackWithBigFish, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE63:: @ 81DCE63
+SlateportCity_EventScript_OldWoman:: @ 81DCE63
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCE7A
-	msgbox SlateportCity_Text_1DD8A6, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_OldWomanSternInterview
+	msgbox SlateportCity_Text_HowTownIsBornAndGrows, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE7A:: @ 81DCE7A
-	msgbox SlateportCity_Text_1DE28E, MSGBOX_DEFAULT
+SlateportCity_EventScript_OldWomanSternInterview:: @ 81DCE7A
+	msgbox SlateportCity_Text_CaptSternBeingInterviewed, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCE84:: @ 81DCE84
+SlateportCity_EventScript_Girl:: @ 81DCE84
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCEA4
-	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE
-	msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_GirlSternInterview
+	goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_GirlSecretBase
+	msgbox SlateportCity_Text_SlateportWonderfulPlace, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCEA4:: @ 81DCEA4
-	msgbox SlateportCity_Text_1DE30C, MSGBOX_DEFAULT
+SlateportCity_EventScript_GirlSternInterview:: @ 81DCEA4
+	msgbox SlateportCity_Text_InterviewerSoCool, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCEAE:: @ 81DCEAE
-	msgbox SlateportCity_Text_1DD999, MSGBOX_DEFAULT
+SlateportCity_EventScript_GirlSecretBase:: @ 81DCEAE
+	msgbox SlateportCity_Text_BuyBricksSoDecorWontGetDirty, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCEB8:: @ 81DCEB8
+SlateportCity_EventScript_RichBoy:: @ 81DCEB8
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCECF
-	msgbox SlateportCity_Text_1DDA34, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_RichBoySternInterview
+	msgbox SlateportCity_Text_GoingToCompeteInBattleTent, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCECF:: @ 81DCECF
-	msgbox SlateportCity_Text_1DE376, MSGBOX_DEFAULT
+SlateportCity_EventScript_RichBoySternInterview:: @ 81DCECF
+	msgbox SlateportCity_Text_SternSaysDiscoveredSomething, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCED9:: @ 81DCED9
+SlateportCity_EventScript_FatMan:: @ 81DCED9
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	goto_if_eq SlateportCity_EventScript_1DCEED
-	msgbox SlateportCity_Text_1DDA9A, MSGBOX_NPC
+	goto_if_eq SlateportCity_EventScript_FatManSternInterview
+	msgbox SlateportCity_Text_BushedHikingFromMauville, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DCEED:: @ 81DCEED
-	msgbox SlateportCity_Text_1DE43D, MSGBOX_SIGN
+SlateportCity_EventScript_FatManSternInterview:: @ 81DCEED
+	msgbox SlateportCity_Text_AmIOnTV, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCEF6:: @ 81DCEF6
+SlateportCity_EventScript_Man1:: @ 81DCEF6
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCF0D
-	msgbox SlateportCity_Text_1DDB21, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_Man1SternInterview
+	msgbox SlateportCity_Text_EveryoneCallsHimCaptStern, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCF0D:: @ 81DCF0D
-	msgbox SlateportCity_Text_1DE460, MSGBOX_DEFAULT
+SlateportCity_EventScript_Man1SternInterview:: @ 81DCF0D
+	msgbox SlateportCity_Text_CaptainsACelebrity, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCF17:: @ 81DCF17
+SlateportCity_EventScript_Woman1:: @ 81DCF17
 	lock
 	faceplayer
-	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_1DCF2C
-	msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT
+	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_Woman1AquaGone
+	msgbox SlateportCity_Text_WhatsLongLineOverThere, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCF2C:: @ 81DCF2C
-	msgbox SlateportCity_Text_1DDBD5, MSGBOX_DEFAULT
+SlateportCity_EventScript_Woman1AquaGone:: @ 81DCF2C
+	msgbox SlateportCity_Text_VisitedMuseumOften, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCF36:: @ 81DCF36
-	msgbox SlateportCity_Text_1DE8BC, MSGBOX_SIGN
+SlateportCity_EventScript_BattleTentSign:: @ 81DCF36
+	msgbox SlateportCity_Text_BattleTentSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF3F:: @ 81DCF3F
+SlateportCity_EventScript_SternsShipyardSign:: @ 81DCF3F
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCF66
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_1DCF5C
-	msgbox SlateportCity_Text_1DE8F8, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_SternsShipyardFerryComplete
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_SternsShipyardNearsCompletion
+	msgbox SlateportCity_Text_SternsShipyardWantedSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCF5C:: @ 81DCF5C
-	msgbox SlateportCity_Text_1DE940, MSGBOX_DEFAULT
+SlateportCity_EventScript_SternsShipyardNearsCompletion:: @ 81DCF5C
+	msgbox SlateportCity_Text_SternsShipyardNearsCompletion, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCF66:: @ 81DCF66
-	msgbox SlateportCity_Text_1DE9AA, MSGBOX_DEFAULT
+SlateportCity_EventScript_SternsShipyardFerryComplete:: @ 81DCF66
+	msgbox SlateportCity_Text_SternsShipyardFerryComplete, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCF70:: @ 81DCF70
-	msgbox SlateportCity_Text_1DEA0B, MSGBOX_SIGN
+SlateportCity_EventScript_PokemonFanClubSign:: @ 81DCF70
+	msgbox SlateportCity_Text_PokemonFanClubSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF79:: @ 81DCF79
-	msgbox SlateportCity_Text_1DEA3B, MSGBOX_SIGN
+SlateportCity_EventScript_OceanicMuseumSign:: @ 81DCF79
+	msgbox SlateportCity_Text_OceanicMuseumSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF82:: @ 81DCF82
-	msgbox SlateportCity_Text_1DEA6F, MSGBOX_SIGN
+SlateportCity_EventScript_CitySign:: @ 81DCF82
+	msgbox SlateportCity_Text_CitySign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF8B:: @ 81DCF8B
-	msgbox SlateportCity_Text_1DEAAF, MSGBOX_SIGN
+SlateportCity_EventScript_MarketSign:: @ 81DCF8B
+	msgbox SlateportCity_Text_MarketSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCF94:: @ 81DCF94
+SlateportCity_EventScript_HarborSign:: @ 81DCF94
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_1DCFA8
-	msgbox SlateportCity_Text_1DEAE3, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_HarborSignFerryComplete
+	msgbox SlateportCity_Text_HarborFerryUnderConstruction, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCFA8:: @ 81DCFA8
-	msgbox SlateportCity_Text_1DEB5A, MSGBOX_DEFAULT
+SlateportCity_EventScript_HarborSignFerryComplete:: @ 81DCFA8
+	msgbox SlateportCity_Text_HarborSign, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_EventScript_1DCFB2:: @ 81DCFB2
-	msgbox SlateportCity_Text_1DEBA0, MSGBOX_SIGN
+SlateportCity_EventScript_NameRatersHouseSign:: @ 81DCFB2
+	msgbox SlateportCity_Text_NameRatersHouseSign, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DCFBB:: @ 81DCFBB
+SlateportCity_EventScript_Maniac:: @ 81DCFBB
 	lock
 	faceplayer
 	compare VAR_SLATEPORT_CITY_STATE, 1
-	call_if_eq SlateportCity_EventScript_1DCFD2
-	msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_EventScript_ManiacSternInterview
+	msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCFD2:: @ 81DCFD2
-	msgbox SlateportCity_Text_1DE10E, MSGBOX_DEFAULT
+@ Unclear if the text here was meant to be different, but its not
+SlateportCity_EventScript_ManiacSternInterview:: @ 81DCFD2
+	msgbox SlateportCity_Text_GetNameRaterToHelpYou, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DCFDC:: @ 81DCFDC
-	msgbox SlateportCity_Text_1DE16C, MSGBOX_NPC
+SlateportCity_EventScript_Woman2:: @ 81DCFDC
+	msgbox SlateportCity_Text_CantChangeTradeMonName, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DCFE5:: @ 81DCFE5
-	msgbox SlateportCity_Text_1DDFF7, MSGBOX_NPC
+SlateportCity_EventScript_Sailor1:: @ 81DCFE5
+	msgbox SlateportCity_Text_SeaIsSoWet, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DCFEE:: @ 81DCFEE
-	msgbox SlateportCity_Text_1DE04B, MSGBOX_NPC
+SlateportCity_EventScript_Sailor2:: @ 81DCFEE
+	msgbox SlateportCity_Text_SinkOldBoats, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DCFF7:: @ 81DCFF7
-	msgbox SlateportCity_Text_1DE0D2, MSGBOX_NPC
+SlateportCity_EventScript_PokefanF:: @ 81DCFF7
+	msgbox SlateportCity_Text_BuyTooMuch, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DD000:: @ 81DD000
-	msgbox SlateportCity_Text_1DE1EC, MSGBOX_NPC
+SlateportCity_EventScript_Man2:: @ 81DD000
+	msgbox SlateportCity_Text_BattleTentBuiltRecently, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DD009:: @ 81DD009
+SlateportCity_EventScript_AquaGrunt1:: @ 81DD009
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDC4F, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_QuitPushing, MSGBOX_DEFAULT
 	closemessage
 	applymovement 5, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD020:: @ 81DD020
+SlateportCity_EventScript_AquaGrunt2:: @ 81DD020
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDC8A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_AquaHasPolicy, MSGBOX_DEFAULT
 	closemessage
 	applymovement 18, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD037:: @ 81DD037
+SlateportCity_EventScript_AquaGrunt3:: @ 81DD037
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDCD5, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_BossIsBrilliant, MSGBOX_DEFAULT
 	closemessage
 	applymovement 19, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD04E:: @ 81DD04E
+SlateportCity_EventScript_AquaGrunt4:: @ 81DD04E
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDD18, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_WhatsNewSchemeIWonder, MSGBOX_DEFAULT
 	closemessage
 	applymovement 26, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD065:: @ 81DD065
+SlateportCity_EventScript_AquaGrunt5:: @ 81DD065
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDD7D, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_ShouldTakeItAll, MSGBOX_DEFAULT
 	closemessage
 	applymovement 27, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD07C:: @ 81DD07C
+SlateportCity_EventScript_AquaGrunt6:: @ 81DD07C
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDDC0, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_DontButtIn, MSGBOX_DEFAULT
 	closemessage
 	applymovement 28, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD093:: @ 81DD093
+SlateportCity_EventScript_AquaGrunt7:: @ 81DD093
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDDDF, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_RemindsMeOfLongLineForGames, MSGBOX_DEFAULT
 	closemessage
 	applymovement 29, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD0AA:: @ 81DD0AA
+SlateportCity_EventScript_AquaGrunt8:: @ 81DD0AA
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDE2F, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_WhyAreWeLiningUp, MSGBOX_DEFAULT
 	closemessage
 	applymovement 30, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD0C1:: @ 81DD0C1
+SlateportCity_EventScript_AquaGrunt9:: @ 81DD0C1
 	lock
 	faceplayer
 	playse SE_PIN
@@ -442,51 +443,51 @@ SlateportCity_EventScript_1DD0C1:: @ 81DD0C1
 	waitmovement 0
 	applymovement 31, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SlateportCity_Text_1DDE6E, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_WhatDoYouWant, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
+	applymovement 31, SlateportCity_Movement_DelayAquaGrunt
 	waitmovement 0
 	applymovement 31, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_Text_1DDE86, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_IllReadSignForYou, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
+	applymovement 31, SlateportCity_Movement_DelayAquaGrunt
 	waitmovement 0
-	msgbox SlateportCity_Text_1DDEB8, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_SaysSomethingLikeSeaIsEndless, MSGBOX_DEFAULT
 	closemessage
 	applymovement 31, Common_Movement_FacePlayer
 	waitmovement 0
-	applymovement 31, SlateportCity_Movement_1DD147
+	applymovement 31, SlateportCity_Movement_DelayAquaGrunt
 	waitmovement 0
 	applymovement 31, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_Movement_1DD147: @ 81DD147
+SlateportCity_Movement_DelayAquaGrunt: @ 81DD147
 	delay_16
 	delay_16
 	step_end
 
-SlateportCity_EventScript_1DD14A:: @ 81DD14A
-	msgbox SlateportCity_Text_1DDF32, MSGBOX_SIGN
+SlateportCity_EventScript_AquaGrunt10:: @ 81DD14A
+	msgbox SlateportCity_Text_ShouldveBroughtMyGameBoy, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DD153:: @ 81DD153
+SlateportCity_EventScript_AquaGrunt11:: @ 81DD153
 	lock
 	faceplayer
-	msgbox SlateportCity_Text_1DDF8D, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_HotSpringsAfterOperation, MSGBOX_DEFAULT
 	closemessage
 	applymovement 33, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_EventScript_1DD16A:: @ 81DD16A
+SlateportCity_EventScript_DollClerk:: @ 81DD16A
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
@@ -505,23 +506,23 @@ SlateportCity_PokemartDecor_Dolls: @ 81DD184
 	release
 	end
 
-SlateportCity_EventScript_1DD18E:: @ 81DD18E
+SlateportCity_EventScript_ComeBackWithSecretPower:: @ 81DD18E
 	msgbox gText_ComeBackWithSecretPower, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DD198:: @ 81DD198
+SlateportCity_EventScript_DecorClerk:: @ 81DD198
 	lock
 	faceplayer
-	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DD18E
+	goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_ComeBackWithSecretPower
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemartdecoration SlateportCity_PokemartDecor_1DD1B8
+	pokemartdecoration SlateportCity_PokemartDecor
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8
+SlateportCity_PokemartDecor: @ 81DD1B8
 	.2byte DECOR_RED_BRICK
 	.2byte DECOR_BLUE_BRICK
 	.2byte DECOR_YELLOW_BRICK
@@ -540,28 +541,29 @@ SlateportCity_PokemartDecor_1DD1B8: @ 81DD1B8
 	release
 	end
 
-SlateportCity_EventScript_1DD1D8:: @ 81DD1D8
+SlateportCity_EventScript_PowerTMClerk:: @ 81DD1D8
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	pokemart SlateportCity_Pokemart_1DD1F0
+	pokemart SlateportCity_Pokemart_PowerTMs
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-SlateportCity_Pokemart_1DD1F0: @ 81DD1F0
-	.2byte ITEM_TM10
-	.2byte ITEM_TM43
+SlateportCity_Pokemart_PowerTMs: @ 81DD1F0
+	.2byte ITEM_TM10  @ Hidden Power
+	.2byte ITEM_TM43  @ Secret Power
 	.2byte ITEM_NONE
 	release
 	end
 
-SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
+@ Scene with Capt Sterns interview and Team Aqua announcing plans to steal Submarine
+SlateportCity_EventScript_CaptStern:: @ 81DD1F8
 	lockall
-	msgbox SlateportCity_Text_1DE502, MSGBOX_DEFAULT
-	msgbox SlateportCity_Text_1DE54A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_SternMoveAheadWithExploration, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_GabbyWonderfulThanksForInterview, MSGBOX_DEFAULT
 	closemessage
 	applymovement 10, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
@@ -569,28 +571,28 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	applymovement 9, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	delay 25
-	applymovement 11, SlateportCity_Movement_1DD33C
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD34A
-	applymovement 10, SlateportCity_Movement_1DD319
-	applymovement 9, SlateportCity_Movement_1DD326
+	applymovement 11, SlateportCity_Movement_SternWatchGabbyAndTyExit
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerFaceStern
+	applymovement 10, SlateportCity_Movement_GabbyExit
+	applymovement 9, SlateportCity_Movement_TyExit
 	waitmovement 0
 	removeobject 10
 	removeobject 9
-	msgbox SlateportCity_Text_1DE5F7, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_SternWhewFirstInterview, MSGBOX_DEFAULT
 	applymovement 11, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_Text_1DE64F, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_OhPlayerWeMadeDiscovery, MSGBOX_DEFAULT
 	playbgm MUS_AQA_0, 0
-	msgbox SlateportCity_Text_1DE724, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_AquaWillAssumeControlOfSubmarine, MSGBOX_DEFAULT
 	applymovement 6, Common_Movement_WalkInPlaceFastestLeft
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
-	applymovement 7, SlateportCity_Movement_1DD309
+	applymovement 7, SlateportCity_Movement_OldWomanConcern
 	applymovement 3, Common_Movement_QuestionMark
-	applymovement 2, SlateportCity_Movement_1DD311
+	applymovement 2, SlateportCity_Movement_ManConcern
 	waitmovement 0
 	applymovement 11, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox SlateportCity_Text_1DE7F7, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_SternWhatWasAllThat, MSGBOX_DEFAULT
 	playse SE_PIN
 	applymovement 11, Common_Movement_ExclamationMark
 	waitmovement 0
@@ -598,11 +600,11 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	waitmovement 0
 	applymovement 11, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_Text_1DE860, MSGBOX_DEFAULT
-	msgbox SlateportCity_Text_1DE8A0, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_FromHarborTryingToTakeSub, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_PleaseComeWithMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement 11, SlateportCity_Movement_1DD337
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD344
+	applymovement 11, SlateportCity_Movement_SternEnterHarbor
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerEnterHarbor
 	waitmovement 0
 	removeobject 11
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN
@@ -615,7 +617,7 @@ SlateportCity_EventScript_1DD1F8:: @ 81DD1F8
 	releaseall
 	end
 
-SlateportCity_Movement_1DD309: @ 81DD309
+SlateportCity_Movement_OldWomanConcern: @ 81DD309
 	delay_16
 	delay_16
 	emote_question_mark
@@ -625,7 +627,7 @@ SlateportCity_Movement_1DD309: @ 81DD309
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_1DD311: @ 81DD311
+SlateportCity_Movement_ManConcern: @ 81DD311
 	emote_question_mark
 	walk_in_place_fastest_up
 	delay_16
@@ -635,7 +637,7 @@ SlateportCity_Movement_1DD311: @ 81DD311
 	walk_in_place_fastest_left
 	step_end
 
-SlateportCity_Movement_1DD319: @ 81DD319
+SlateportCity_Movement_GabbyExit: @ 81DD319
 	delay_16
 	walk_left
 	walk_left
@@ -650,7 +652,7 @@ SlateportCity_Movement_1DD319: @ 81DD319
 	walk_left
 	step_end
 
-SlateportCity_Movement_1DD326: @ 81DD326
+SlateportCity_Movement_TyExit: @ 81DD326
 	walk_down
 	walk_left
 	walk_left
@@ -666,19 +668,20 @@ SlateportCity_Movement_1DD326: @ 81DD326
 	walk_left
 	step_end
 
+@ Unused
 SlateportCity_Movement_1DD334: @ 81DD334
 	walk_down
 	walk_in_place_fastest_up
 	step_end
 
-SlateportCity_Movement_1DD337: @ 81DD337
+SlateportCity_Movement_SternEnterHarbor: @ 81DD337
 	walk_right
 	walk_up
 	walk_up
 	set_invisible
 	step_end
 
-SlateportCity_Movement_1DD33C: @ 81DD33C
+SlateportCity_Movement_SternWatchGabbyAndTyExit: @ 81DD33C
 	delay_16
 	delay_16
 	delay_16
@@ -688,7 +691,7 @@ SlateportCity_Movement_1DD33C: @ 81DD33C
 	walk_left
 	step_end
 
-SlateportCity_Movement_1DD344: @ 81DD344
+SlateportCity_Movement_PlayerEnterHarbor: @ 81DD344
 	walk_in_place_fastest_right
 	delay_16
 	delay_16
@@ -696,7 +699,7 @@ SlateportCity_Movement_1DD344: @ 81DD344
 	walk_up
 	step_end
 
-SlateportCity_Movement_1DD34A: @ 81DD34A
+SlateportCity_Movement_PlayerFaceStern: @ 81DD34A
 	delay_16
 	delay_16
 	delay_16
@@ -707,198 +710,198 @@ SlateportCity_Movement_1DD34A: @ 81DD34A
 	walk_in_place_fastest_down
 	step_end
 
-SlateportCity_EventScript_1DD353:: @ 81DD353
-	msgbox SlateportCity_Text_1DE491, MSGBOX_SIGN
+SlateportCity_EventScript_Ty:: @ 81DD353
+	msgbox SlateportCity_Text_BigSmileForCamera, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DD35C:: @ 81DD35C
-	msgbox SlateportCity_Text_1DE4C4, MSGBOX_SIGN
+SlateportCity_EventScript_Gabby:: @ 81DD35C
+	msgbox SlateportCity_Text_MostInvaluableExperience, MSGBOX_SIGN
 	end
 
-SlateportCity_EventScript_1DD365:: @ 81DD365
-	msgbox SlateportCity_Text_1DD7AD, MSGBOX_NPC
+SlateportCity_EventScript_Man3:: @ 81DD365
+	msgbox SlateportCity_Text_WonderIfLighthouseStartlesPokemon, MSGBOX_NPC
 	end
 
-SlateportCity_EventScript_1DD36E:: @ 81DD36E
+SlateportCity_EventScript_BerryPowderClerk:: @ 81DD36E
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_1DD39A
-	msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_POWDER_JAR, SlateportCity_EventScript_ReceivedPowderJar
+	msgbox SlateportCity_Text_ExplainBerries, MSGBOX_DEFAULT
 	giveitem_std ITEM_POWDER_JAR
 	setflag FLAG_RECEIVED_POWDER_JAR
-	msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DD39A:: @ 81DD39A
+SlateportCity_EventScript_ReceivedPowderJar:: @ 81DD39A
 	setvar VAR_0x8004, 1
 	specialvar VAR_RESULT, HasEnoughBerryPowder
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_EventScript_1DD3C0
-	msgbox SlateportCity_Text_1DEE40, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_EventScript_ExplainBerryPowder
+	msgbox SlateportCity_Text_BroughtMeSomeBerryPowder, MSGBOX_DEFAULT
 	special DisplayBerryPowderVendorMenu
-	goto SlateportCity_EventScript_1DD3CA
+	goto SlateportCity_EventScript_ChooseBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD3C0:: @ 81DD3C0
-	msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT
+SlateportCity_EventScript_ExplainBerryPowder:: @ 81DD3C0
+	msgbox SlateportCity_Text_ExplainBerryPowder, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_EventScript_1DD3CA:: @ 81DD3CA
-	message SlateportCity_Text_1DEE67
+SlateportCity_EventScript_ChooseBerryPowderItem:: @ 81DD3CA
+	message SlateportCity_Text_ExchangeWhatWithIt
 	waitmessage
 	setvar VAR_0x8004, SCROLL_MULTI_BERRY_POWDER_VENDOR
 	special ShowScrollableMultichoice
 	waitstate
 	switch VAR_RESULT
-	case 0, SlateportCity_EventScript_1DD46E
-	case 1, SlateportCity_EventScript_1DD482
-	case 2, SlateportCity_EventScript_1DD496
-	case 3, SlateportCity_EventScript_1DD4AA
-	case 4, SlateportCity_EventScript_1DD4BE
-	case 5, SlateportCity_EventScript_1DD4D2
-	case 6, SlateportCity_EventScript_1DD4E6
-	case 7, SlateportCity_EventScript_1DD4FA
-	case 8, SlateportCity_EventScript_1DD50E
-	case 9, SlateportCity_EventScript_1DD522
-	case 10, SlateportCity_EventScript_1DD536
-	case 11, SlateportCity_EventScript_1DD54A
-	case MULTI_B_PRESSED, SlateportCity_EventScript_1DD54A
-	end
-
-SlateportCity_EventScript_1DD46E:: @ 81DD46E
+	case 0, SlateportCity_EventScript_EnergyPowder
+	case 1, SlateportCity_EventScript_EnergyRoot
+	case 2, SlateportCity_EventScript_HealPowder
+	case 3, SlateportCity_EventScript_RevivalHerb
+	case 4, SlateportCity_EventScript_Protein
+	case 5, SlateportCity_EventScript_Iron
+	case 6, SlateportCity_EventScript_Carbos
+	case 7, SlateportCity_EventScript_Calcium
+	case 8, SlateportCity_EventScript_Zinc
+	case 9, SlateportCity_EventScript_HPUp
+	case 10, SlateportCity_EventScript_PPUp
+	case 11, SlateportCity_EventScript_CancelPowderItemSelect
+	case MULTI_B_PRESSED, SlateportCity_EventScript_CancelPowderItemSelect
+	end
+
+SlateportCity_EventScript_EnergyPowder:: @ 81DD46E
 	bufferitemname 0, ITEM_ENERGY_POWDER
 	setvar VAR_0x8008, ITEM_ENERGY_POWDER
 	setvar VAR_0x8009, 50
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD482:: @ 81DD482
+SlateportCity_EventScript_EnergyRoot:: @ 81DD482
 	bufferitemname 0, ITEM_ENERGY_ROOT
 	setvar VAR_0x8008, ITEM_ENERGY_ROOT
 	setvar VAR_0x8009, 80
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD496:: @ 81DD496
+SlateportCity_EventScript_HealPowder:: @ 81DD496
 	bufferitemname 0, ITEM_HEAL_POWDER
 	setvar VAR_0x8008, ITEM_HEAL_POWDER
 	setvar VAR_0x8009, 50
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4AA:: @ 81DD4AA
+SlateportCity_EventScript_RevivalHerb:: @ 81DD4AA
 	bufferitemname 0, ITEM_REVIVAL_HERB
 	setvar VAR_0x8008, ITEM_REVIVAL_HERB
 	setvar VAR_0x8009, 300
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4BE:: @ 81DD4BE
+SlateportCity_EventScript_Protein:: @ 81DD4BE
 	bufferitemname 0, ITEM_PROTEIN
 	setvar VAR_0x8008, ITEM_PROTEIN
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4D2:: @ 81DD4D2
+SlateportCity_EventScript_Iron:: @ 81DD4D2
 	bufferitemname 0, ITEM_IRON
 	setvar VAR_0x8008, ITEM_IRON
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4E6:: @ 81DD4E6
+SlateportCity_EventScript_Carbos:: @ 81DD4E6
 	bufferitemname 0, ITEM_CARBOS
 	setvar VAR_0x8008, ITEM_CARBOS
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD4FA:: @ 81DD4FA
+SlateportCity_EventScript_Calcium:: @ 81DD4FA
 	bufferitemname 0, ITEM_CALCIUM
 	setvar VAR_0x8008, ITEM_CALCIUM
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD50E:: @ 81DD50E
+SlateportCity_EventScript_Zinc:: @ 81DD50E
 	bufferitemname 0, ITEM_ZINC
 	setvar VAR_0x8008, ITEM_ZINC
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD522:: @ 81DD522
+SlateportCity_EventScript_HPUp:: @ 81DD522
 	bufferitemname 0, ITEM_HP_UP
 	setvar VAR_0x8008, ITEM_HP_UP
 	setvar VAR_0x8009, 1000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD536:: @ 81DD536
+SlateportCity_EventScript_PPUp:: @ 81DD536
 	bufferitemname 0, ITEM_PP_UP
 	setvar VAR_0x8008, ITEM_PP_UP
 	setvar VAR_0x8009, 3000
-	goto SlateportCity_EventScript_1DD557
+	goto SlateportCity_EventScript_TryBuyBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD54A:: @ 81DD54A
-	msgbox SlateportCity_Text_1DEFBC, MSGBOX_DEFAULT
+SlateportCity_EventScript_CancelPowderItemSelect:: @ 81DD54A
+	msgbox SlateportCity_Text_ComeBackToTradeBerryPowder, MSGBOX_DEFAULT
 	special RemoveBerryPowderVendorMenu
 	release
 	end
 
-SlateportCity_EventScript_1DD557:: @ 81DD557
-	msgbox SlateportCity_Text_1DEE90, MSGBOX_YESNO
+SlateportCity_EventScript_TryBuyBerryPowderItem:: @ 81DD557
+	msgbox SlateportCity_Text_ExchangeBerryPowderForItem, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq SlateportCity_EventScript_1DD3CA
+	goto_if_eq SlateportCity_EventScript_ChooseBerryPowderItem
 	copyvar VAR_0x8004, VAR_0x8009
 	specialvar VAR_RESULT, HasEnoughBerryPowder
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_EventScript_1DD5CE
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_EventScript_NotEnoughBerryPowder
 	giveitem_std VAR_0x8008
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_EventScript_1DD5C1
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_EventScript_NoRoomForBerryPowderItem
 	copyvar VAR_0x8004, VAR_0x8009
 	special TakeBerryPowder
 	special PrintPlayerBerryPowderAmount
-	msgbox SlateportCity_Text_1DEEF7, MSGBOX_YESNO
+	msgbox SlateportCity_Text_FineBerryPowderTradeSomethingElse, MSGBOX_YESNO
 	compare VAR_RESULT, YES
-	goto_if_eq SlateportCity_EventScript_1DD3CA
-	msgbox SlateportCity_Text_1DEF79, MSGBOX_DEFAULT
+	goto_if_eq SlateportCity_EventScript_ChooseBerryPowderItem
+	msgbox SlateportCity_Text_WhenYouGetMoreBringItToMe, MSGBOX_DEFAULT
 	special RemoveBerryPowderVendorMenu
 	release
 	end
 
-SlateportCity_EventScript_1DD5C1:: @ 81DD5C1
+SlateportCity_EventScript_NoRoomForBerryPowderItem:: @ 81DD5C1
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
 	special RemoveBerryPowderVendorMenu
 	release
 	end
 
-SlateportCity_EventScript_1DD5CE:: @ 81DD5CE
-	msgbox SlateportCity_Text_1DEEC9, MSGBOX_DEFAULT
-	goto SlateportCity_EventScript_1DD3CA
+SlateportCity_EventScript_NotEnoughBerryPowder:: @ 81DD5CE
+	msgbox SlateportCity_Text_DontHaveEnoughBerryPowder, MSGBOX_DEFAULT
+	goto SlateportCity_EventScript_ChooseBerryPowderItem
 	end
 
-SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
+SlateportCity_EventScript_ScottBattleTentScene:: @ 81DD5DC
 	lockall
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_FaceUp
 	waitmovement 0
 	opendoor 10, 12
 	waitdooranim
 	addobject 35
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD630
-	applymovement 35, SlateportCity_Movement_1DD637
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PushPlayerDown
+	applymovement 35, SlateportCity_Movement_ScottExitBattleTent
 	waitmovement 0
 	closedoor 10, 12
 	waitdooranim
-	msgbox SlateportCity_Text_1DF28C, MSGBOX_DEFAULT
+	msgbox SlateportCity_Text_TakingBattleTentChallenge, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_1DD634
-	applymovement 35, SlateportCity_Movement_1DD63A
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Movement_PlayerWatchScottExit
+	applymovement 35, SlateportCity_Movement_ScottExitAfterBattleTent
 	waitmovement 0
 	removeobject 35
 	addvar VAR_SCOTT_STATE, 1
@@ -906,23 +909,23 @@ SlateportCity_EventScript_1DD5DC:: @ 81DD5DC
 	releaseall
 	end
 
-SlateportCity_Movement_1DD630: @ 81DD630
+SlateportCity_Movement_PushPlayerDown: @ 81DD630
 	lock_facing_direction
 	walk_down
 	unlock_facing_direction
 	step_end
 
-SlateportCity_Movement_1DD634: @ 81DD634
+SlateportCity_Movement_PlayerWatchScottExit: @ 81DD634
 	delay_16
 	walk_in_place_fastest_right
 	step_end
 
-SlateportCity_Movement_1DD637: @ 81DD637
+SlateportCity_Movement_ScottExitBattleTent: @ 81DD637
 	delay_8
 	walk_down
 	step_end
 
-SlateportCity_Movement_1DD63A: @ 81DD63A
+SlateportCity_Movement_ScottExitAfterBattleTent: @ 81DD63A
 	walk_right
 	walk_right
 	walk_right
@@ -933,193 +936,193 @@ SlateportCity_Movement_1DD63A: @ 81DD63A
 	walk_right
 	step_end
 
-SlateportCity_EventScript_1DD643:: @ 81DD643
+SlateportCity_EventScript_BerryCrushRankingsSign:: @ 81DD643
 	lockall
-	special sub_80224D0
+	special ShowBerryCrushRankings
 	waitstate
 	releaseall
 	end
 
-SlateportCity_Text_1DD64A: @ 81DD64A
+SlateportCity_Text_EnergyGuruSellWhatYouNeed: @ 81DD64A
 	.string "I'm the ENERGY GURU! I'll go for it and\n"
 	.string "sell you what you need!$"
 
-SlateportCity_Text_1DD68A: @ 81DD68A
+SlateportCity_Text_OhYourPokemon: @ 81DD68A
 	.string "Oh?\n"
 	.string "Your {STR_VAR_1}…$"
 
-SlateportCity_Text_1DD697: @ 81DD697
+SlateportCity_Text_PleaseGiveItThisEffortRibbon: @ 81DD697
 	.string "Went for it stupendously!\p"
 	.string "As its reward, please give it this\n"
 	.string "EFFORT RIBBON.$"
 
-SlateportCity_Text_1DD6E3: @ 81DD6E3
+SlateportCity_Text_ReceivedEffortRibbon: @ 81DD6E3
 	.string "{PLAYER} received the EFFORT RIBBON.$"
 
-SlateportCity_Text_1DD702: @ 81DD702
+SlateportCity_Text_PutEffortRibbonOnMon: @ 81DD702
 	.string "{PLAYER} put the EFFORT RIBBON\n"
 	.string "on {STR_VAR_1}.$"
 
-SlateportCity_Text_1DD722: @ 81DD722
+SlateportCity_Text_GoForItLittleHarder: @ 81DD722
 	.string "You have to go for it a little harder.\p"
 	.string "If you do, I'll give your POKéMON\n"
 	.string "something nice.$"
 
-SlateportCity_Text_1DD77B: @ 81DD77B
+SlateportCity_Text_EffortRibbonLooksGoodOnIt: @ 81DD77B
 	.string "Oh! Your {STR_VAR_1}, that EFFORT\n"
 	.string "RIBBON looks good on it!$"
 
-SlateportCity_Text_1DD7AD: @ 81DD7AD
+SlateportCity_Text_WonderIfLighthouseStartlesPokemon: @ 81DD7AD
 	.string "The light of the lighthouse reaches\n"
 	.string "dozens of miles away.\p"
 	.string "I wonder if it doesn't startle POKéMON\n"
 	.string "in the sea.$"
 
-SlateportCity_Text_1DD81A: @ 81DD81A
+SlateportCity_Text_SeaweedFullOfLife: @ 81DD81A
 	.string "Ooh, look at this!\p"
 	.string "The seaweed you can get around these\n"
 	.string "parts is fresh and full of life.\p"
 	.string "Why, it looks like it can even rear up\n"
 	.string "and attack!$"
 
-SlateportCity_Text_1DD8A6: @ 81DD8A6
+SlateportCity_Text_HowTownIsBornAndGrows: @ 81DD8A6
 	.string "Where the water is clean, the fruits\n"
 	.string "of bountiful harvest gather.\p"
 	.string "And where people gather, a market\n"
 	.string "soon starts.\p"
 	.string "That is how a town is born and grows.$"
 
-SlateportCity_Text_1DD93D: @ 81DD93D
+SlateportCity_Text_SlateportWonderfulPlace: @ 81DD93D
 	.string "Shopping where you can breathe the\n"
 	.string "scent of the ocean…\p"
 	.string "SLATEPORT is such a wonderful place!$"
 
-SlateportCity_Text_1DD999: @ 81DD999
+SlateportCity_Text_BuyBricksSoDecorWontGetDirty: @ 81DD999
 	.string "If you put DOLLS or CUSHIONS on\n"
 	.string "the floor, they'll get dirty.\p"
 	.string "I'm going to buy some BRICKS so my\n"
 	.string "DOLLS and CUSHIONS won't get dirty\l"
 	.string "when I leave them out.$"
 
-SlateportCity_Text_1DDA34: @ 81DDA34
+SlateportCity_Text_GoingToCompeteInBattleTent: @ 81DDA34
 	.string "Wroooar! I'm going to compete in\n"
 	.string "the BATTLE TENT, too!\p"
 	.string "But before that, I need to catch\n"
 	.string "some POKéMON!$"
 
-SlateportCity_Text_1DDA9A: @ 81DDA9A
+SlateportCity_Text_BushedHikingFromMauville: @ 81DDA9A
 	.string "Whew… I'm just bushed…\p"
 	.string "I hiked over from MAUVILLE CITY.\n"
 	.string "But, boy, this city's huge.\p"
 	.string "If I'd known this, I would've ridden\n"
 	.string "my BIKE here.$"
 
-SlateportCity_Text_1DDB21: @ 81DDB21
+SlateportCity_Text_EveryoneCallsHimCaptStern: @ 81DDB21
 	.string "STERN, the fellow who built the\n"
 	.string "MUSEUM, also happens to be the leader\l"
 	.string "of an undersea exploration team.\p"
 	.string "So, everyone calls him CAPT. STERN.$"
 
-SlateportCity_Text_1DDBAC: @ 81DDBAC
+SlateportCity_Text_WhatsLongLineOverThere: @ 81DDBAC
 	.string "What is that over there?\n"
 	.string "That long line…$"
 
-SlateportCity_Text_1DDBD5: @ 81DDBD5
+SlateportCity_Text_VisitedMuseumOften: @ 81DDBD5
 	.string "When I was a child, I visited\n"
 	.string "the MUSEUM often.\p"
 	.string "I used to dream about the mysteries of\n"
 	.string "the sea after seeing the exhibits.$"
 
-SlateportCity_Text_1DDC4F: @ 81DDC4F
+SlateportCity_Text_QuitPushing: @ 81DDC4F
 	.string "Hey, there! Quit pushing!\n"
 	.string "This is the line, can't you see?$"
 
-SlateportCity_Text_1DDC8A: @ 81DDC8A
+SlateportCity_Text_AquaHasPolicy: @ 81DDC8A
 	.string "TEAM AQUA has a policy of\n"
 	.string "assembling and dispersing at\l"
 	.string "the operation site.$"
 
-SlateportCity_Text_1DDCD5: @ 81DDCD5
+SlateportCity_Text_BossIsBrilliant: @ 81DDCD5
 	.string "Our BOSS is brilliant.\p"
 	.string "What would he want to do with\n"
 	.string "a MUSEUM now?$"
 
-SlateportCity_Text_1DDD18: @ 81DDD18
+SlateportCity_Text_WhatsNewSchemeIWonder: @ 81DDD18
 	.string "What's the new scheme, I wonder?\p"
 	.string "Our BOSS is scary when he's mad, so\n"
 	.string "I'd better not screw things up…$"
 
-SlateportCity_Text_1DDD7D: @ 81DDD7D
+SlateportCity_Text_ShouldTakeItAll: @ 81DDD7D
 	.string "If there's something we need in\n"
 	.string "the MUSEUM, we should take it all!$"
 
-SlateportCity_Text_1DDDC0: @ 81DDDC0
+SlateportCity_Text_DontButtIn: @ 81DDDC0
 	.string "Hey, you there!\n"
 	.string "Don't butt in!$"
 
-SlateportCity_Text_1DDDDF: @ 81DDDDF
+SlateportCity_Text_RemindsMeOfLongLineForGames: @ 81DDDDF
 	.string "A long line, huh?\p"
 	.string "It reminds me of the times I lined up to\n"
 	.string "buy smash-hit games…$"
 
-SlateportCity_Text_1DDE2F: @ 81DDE2F
+SlateportCity_Text_WhyAreWeLiningUp: @ 81DDE2F
 	.string "Why are we even lining up and paying?\n"
 	.string "We should just march in!$"
 
-SlateportCity_Text_1DDE6E: @ 81DDE6E
+SlateportCity_Text_WhatDoYouWant: @ 81DDE6E
 	.string "What?\n"
 	.string "What do you want?$"
 
-SlateportCity_Text_1DDE86: @ 81DDE86
+SlateportCity_Text_IllReadSignForYou: @ 81DDE86
 	.string "You want to read this sign?\n"
 	.string "I'll read it for you!$"
 
-SlateportCity_Text_1DDEB8: @ 81DDEB8
+SlateportCity_Text_SaysSomethingLikeSeaIsEndless: @ 81DDEB8
 	.string "Let's see…\p"
 	.string "Um… I think it says something like\n"
 	.string "“the life in the sea is endless.”\p"
 	.string "Yup, I'm pretty sure that's what\n"
 	.string "it says.$"
 
-SlateportCity_Text_1DDF32: @ 81DDF32
+SlateportCity_Text_ShouldveBroughtMyGameBoy: @ 81DDF32
 	.string "Grumble…\p"
 	.string "I should've brought my Game Boy\n"
 	.string "Advance so I wouldn't get bored in line…\p"
 	.string "Grumble…$"
 
-SlateportCity_Text_1DDF8D: @ 81DDF8D
+SlateportCity_Text_HotSpringsAfterOperation: @ 81DDF8D
 	.string "When this operation's over, I'll take\n"
 	.string "you to a hot spring spa!\p"
 	.string "That's what our leader said.\n"
 	.string "I can't wait!$"
 
-SlateportCity_Text_1DDFF7: @ 81DDFF7
+SlateportCity_Text_SeaIsSoWet: @ 81DDFF7
 	.string "The sea is just so vast…\p"
 	.string "Could the sea have been made by\n"
 	.string "the tears shed by POKéMON?$"
 
-SlateportCity_Text_1DE04B: @ 81DE04B
+SlateportCity_Text_SinkOldBoats: @ 81DE04B
 	.string "Do you know what they do with old\n"
 	.string "ships that become too creaky to sail?\p"
 	.string "They sink them in the sea so they\n"
 	.string "become habitats for POKéMON.$"
 
-SlateportCity_Text_1DE0D2: @ 81DE0D2
+SlateportCity_Text_BuyTooMuch: @ 81DE0D2
 	.string "Whenever I visit here, I get carried\n"
 	.string "away and buy too much.$"
 
-SlateportCity_Text_1DE10E: @ 81DE10E
+SlateportCity_Text_GetNameRaterToHelpYou: @ 81DE10E
 	.string "If you want to change your POKéMON's\n"
 	.string "nickname, you'll have to get the NAME\l"
 	.string "RATER to help you.$"
 
-SlateportCity_Text_1DE16C: @ 81DE16C
+SlateportCity_Text_CantChangeTradeMonName: @ 81DE16C
 	.string "Any POKéMON you get in a trade,\n"
 	.string "you can't change its nickname.\p"
 	.string "The original TRAINER's love for that\n"
 	.string "POKéMON is in the nickname.$"
 
-SlateportCity_Text_1DE1EC: @ 81DE1EC
+SlateportCity_Text_BattleTentBuiltRecently: @ 81DE1EC
 	.string "Recently, a BATTLE TENT was built\n"
 	.string "in SLATEPORT.\p"
 	.string "GYMS are fun, but the BATTLE TENT's\n"
@@ -1127,62 +1130,62 @@ SlateportCity_Text_1DE1EC: @ 81DE1EC
 	.string "You should go find tough POKéMON\n"
 	.string "for the BATTLE TENT!$"
 
-SlateportCity_Text_1DE28E: @ 81DE28E
+SlateportCity_Text_CaptSternBeingInterviewed: @ 81DE28E
 	.string "I was hoping that it was a famous star\n"
 	.string "so I could get an autograph.\p"
 	.string "But who's that being interviewed?\n"
 	.string "Isn't that CAPT. STERN?$"
 
-SlateportCity_Text_1DE30C: @ 81DE30C
+SlateportCity_Text_InterviewerSoCool: @ 81DE30C
 	.string "That lady interviewer is so cool\n"
 	.string "and pretty.\p"
 	.string "When I grow up, I'm going to be\n"
 	.string "an international journalist!$"
 
-SlateportCity_Text_1DE376: @ 81DE376
+SlateportCity_Text_SternSaysDiscoveredSomething: @ 81DE376
 	.string "CAPT. STERN says they discovered\n"
 	.string "something at the bottom of the sea.\p"
 	.string "I wonder what it is?\n"
 	.string "What could it be?$"
 
-SlateportCity_Text_1DE3E2: @ 81DE3E2
+SlateportCity_Text_CaptainComeBackWithBigFish: @ 81DE3E2
 	.string "What's going on here?\p"
 	.string "Did the good CAPTAIN come back with\n"
 	.string "a big fish from the ocean floor?$"
 
-SlateportCity_Text_1DE43D: @ 81DE43D
+SlateportCity_Text_AmIOnTV: @ 81DE43D
 	.string "Hey! Are you watching?\n"
 	.string "Am I on TV?$"
 
-SlateportCity_Text_1DE460: @ 81DE460
+SlateportCity_Text_CaptainsACelebrity: @ 81DE460
 	.string "A TV interview! Here!\n"
 	.string "The CAPTAIN's a celebrity!$"
 
-SlateportCity_Text_1DE491: @ 81DE491
+SlateportCity_Text_BigSmileForCamera: @ 81DE491
 	.string "TY: Okay, CAPT. STERN, a big smile\n"
 	.string "for the camera!$"
 
-SlateportCity_Text_1DE4C4: @ 81DE4C4
+SlateportCity_Text_MostInvaluableExperience: @ 81DE4C4
 	.string "GABBY: I see, I see. You've had a most\n"
 	.string "invaluable experience…$"
 
-SlateportCity_Text_1DE502: @ 81DE502
+SlateportCity_Text_SternMoveAheadWithExploration: @ 81DE502
 	.string "CAPT. STERN: Yes, indeed. We intend to\n"
 	.string "move ahead with our exploration.$"
 
-SlateportCity_Text_1DE54A: @ 81DE54A
+SlateportCity_Text_GabbyWonderfulThanksForInterview: @ 81DE54A
 	.string "GABBY: That's wonderful, CAPT. STERN!\n"
 	.string "Thank you for taking the time from\l"
 	.string "your busy schedule to talk to us.\p"
 	.string "We hope we can interview you again\n"
 	.string "with news of more discoveries!$"
 
-SlateportCity_Text_1DE5F7: @ 81DE5F7
+SlateportCity_Text_SternWhewFirstInterview: @ 81DE5F7
 	.string "CAPT. STERN: Whew…\p"
 	.string "That was my first time to be filmed for\n"
 	.string "TV. That was nerve-wracking.$"
 
-SlateportCity_Text_1DE64F: @ 81DE64F
+SlateportCity_Text_OhPlayerWeMadeDiscovery: @ 81DE64F
 	.string "Oh! {PLAYER}{KUN}!\n"
 	.string "You're looking great!\p"
 	.string "We made a huge discovery on our last\n"
@@ -1192,7 +1195,7 @@ SlateportCity_Text_1DE64F: @ 81DE64F
 	.string "We think it's the habitat of a POKéMON\n"
 	.string "that's said to have been long extinct.$"
 
-SlateportCity_Text_1DE724: @ 81DE724
+SlateportCity_Text_AquaWillAssumeControlOfSubmarine: @ 81DE724
 	.string "Fufufu…\n"
 	.string "CAPT. STERN, I presume.\p"
 	.string "We of TEAM AQUA will assume\n"
@@ -1203,77 +1206,77 @@ SlateportCity_Text_1DE724: @ 81DE724
 	.string "Just watch and learn what TEAM\l"
 	.string "AQUA has planned!$"
 
-SlateportCity_Text_1DE7F7: @ 81DE7F7
+SlateportCity_Text_SternWhatWasAllThat: @ 81DE7F7
 	.string "CAPT. STERN: What was that all about?\p"
 	.string "It sounded like someone using\n"
 	.string "a megaphone…\p"
 	.string "Where did it come from?$"
 
-SlateportCity_Text_1DE860: @ 81DE860
+SlateportCity_Text_FromHarborTryingToTakeSub: @ 81DE860
 	.string "It's from the HARBOR!\p"
 	.string "The submarine!\n"
 	.string "They're trying to take it!$"
 
-SlateportCity_Text_1DE8A0: @ 81DE8A0
+SlateportCity_Text_PleaseComeWithMe: @ 81DE8A0
 	.string "{PLAYER}{KUN}!\n"
 	.string "Please, come with me!$"
 
-SlateportCity_Text_1DE8BC: @ 81DE8BC
+SlateportCity_Text_BattleTentSign: @ 81DE8BC
 	.string "BATTLE TENT SLATEPORT SITE\n"
 	.string "“Find it! The ultimate POKéMON!”$"
 
-SlateportCity_Text_1DE8F8: @ 81DE8F8
+SlateportCity_Text_SternsShipyardWantedSign: @ 81DE8F8
 	.string "STERN'S SHIPYARD\p"
 	.string "“Wanted: A sailor capable of sailing\n"
 	.string "in all currents.”$"
 
-SlateportCity_Text_1DE940: @ 81DE940
+SlateportCity_Text_SternsShipyardNearsCompletion: @ 81DE940
 	.string "STERN'S SHIPYARD\p"
 	.string "“The ferry S.S. TIDAL nears\n"
 	.string "completion for serving the ports of\l"
 	.string "SLATEPORT and LILYCOVE.”$"
 
-SlateportCity_Text_1DE9AA: @ 81DE9AA
+SlateportCity_Text_SternsShipyardFerryComplete: @ 81DE9AA
 	.string "STERN'S SHIPYARD\p"
 	.string "“Boarding of the SLATEPORT-LILYCOVE\n"
 	.string "ferry S.S. TIDAL is handled at the\l"
 	.string "HARBOR.”$"
 
-SlateportCity_Text_1DEA0B: @ 81DEA0B
+SlateportCity_Text_PokemonFanClubSign: @ 81DEA0B
 	.string "POKéMON FAN CLUB\n"
 	.string "“Calling all fans of POKéMON!”$"
 
-SlateportCity_Text_1DEA3B: @ 81DEA3B
+SlateportCity_Text_OceanicMuseumSign: @ 81DEA3B
 	.string "“The endless sea sustains\n"
 	.string "all life.”\p"
 	.string "OCEANIC MUSEUM$"
 
-SlateportCity_Text_1DEA6F: @ 81DEA6F
+SlateportCity_Text_CitySign: @ 81DEA6F
 	.string "SLATEPORT CITY\p"
 	.string "“The port where people and POKéMON\n"
 	.string "cross paths.”$"
 
-SlateportCity_Text_1DEAAF: @ 81DEAAF
+SlateportCity_Text_MarketSign: @ 81DEAAF
 	.string "SLATEPORT MARKET\n"
 	.string "“Unique items found nowhere else!”$"
 
-SlateportCity_Text_1DEAE3: @ 81DEAE3
+SlateportCity_Text_HarborFerryUnderConstruction: @ 81DEAE3
 	.string "SLATEPORT HARBOR\p"
 	.string "“The ferry S.S. TIDAL is under\n"
 	.string "construction in the SHIPYARD.\p"
 	.string "“Service is scheduled to begin\n"
 	.string "shortly.”$"
 
-SlateportCity_Text_1DEB5A: @ 81DEB5A
+SlateportCity_Text_HarborSign: @ 81DEB5A
 	.string "SLATEPORT HARBOR\p"
 	.string "“Enjoy a delightful cruise on\n"
 	.string "the ferry S.S. TIDAL.”$"
 
-SlateportCity_Text_1DEBA0: @ 81DEBA0
+SlateportCity_Text_NameRatersHouseSign: @ 81DEBA0
 	.string "NAME RATER'S HOUSE\n"
 	.string "“POKéMON nicknames rated.”$"
 
-SlateportCity_Text_1DEBCE: @ 81DEBCE
+SlateportCity_Text_ExplainBerries: @ 81DEBCE
 	.string "If a wild POKéMON gets hurt, it heals\n"
 	.string "itself by chewing on BERRIES.\p"
 	.string "Did you know that?\p"
@@ -1288,7 +1291,7 @@ SlateportCity_Text_1DEBCE: @ 81DEBCE
 	.string "I've got something good for someone\n"
 	.string "like you.$"
 
-SlateportCity_Text_1DED27: @ 81DED27
+SlateportCity_Text_ExplainBerryPowder: @ 81DED27
 	.string "I recently had machines installed at\n"
 	.string "POKéMON CENTERS for crushing BERRIES.\p"
 	.string "The BERRY CRUSH machines are at\n"
@@ -1299,39 +1302,39 @@ SlateportCity_Text_1DED27: @ 81DED27
 	.string "I can make you all sorts of medicine\n"
 	.string "if you bring me lots of BERRY POWDER.$"
 
-SlateportCity_Text_1DEE40: @ 81DEE40
+SlateportCity_Text_BroughtMeSomeBerryPowder: @ 81DEE40
 	.string "Have you brought me some\n"
 	.string "BERRY POWDER?$"
 
-SlateportCity_Text_1DEE67: @ 81DEE67
+SlateportCity_Text_ExchangeWhatWithIt: @ 81DEE67
 	.string "What would you like to exchange\n"
 	.string "it with?$"
 
-SlateportCity_Text_1DEE90: @ 81DEE90
+SlateportCity_Text_ExchangeBerryPowderForItem: @ 81DEE90
 	.string "Okay, you want to exchange your\n"
 	.string "BERRY POWDER for one {STR_VAR_1}?$"
 
-SlateportCity_Text_1DEEC9: @ 81DEEC9
+SlateportCity_Text_DontHaveEnoughBerryPowder: @ 81DEEC9
 	.string "Oh, dear. You don't have enough\n"
 	.string "BERRY POWDER.$"
 
-SlateportCity_Text_1DEEF7: @ 81DEEF7
+SlateportCity_Text_FineBerryPowderTradeSomethingElse: @ 81DEEF7
 	.string "This is fine BERRY POWDER.\n"
 	.string "It will make excellent medicine.\p"
 	.string "Would you like to trade more of your\n"
 	.string "BERRY POWDER for something else?$"
 
-SlateportCity_Text_1DEF79: @ 81DEF79
+SlateportCity_Text_WhenYouGetMoreBringItToMe: @ 81DEF79
 	.string "Okay! When you get some more\n"
 	.string "BERRY POWDER, bring it to me, please!$"
 
-SlateportCity_Text_1DEFBC: @ 81DEFBC
+SlateportCity_Text_ComeBackToTradeBerryPowder: @ 81DEFBC
 	.string "Come back if you'd like to trade your\n"
 	.string "BERRY POWDER for some medicine.\p"
 	.string "I'm always running a bazaar here.\p"
 	.string "Did you know?$"
 
-SlateportCity_Text_1DF032: @ 81DF032
+SlateportCity_Text_YouDroveTeamAquaAway: @ 81DF032
 	.string "SCOTT: Huh?\n"
 	.string "I'm sure I met you somewhere before.\p"
 	.string "Have I introduced myself to you?\n"
@@ -1340,22 +1343,22 @@ SlateportCity_Text_1DF032: @ 81DF032
 	.string "here like they were stung.\p"
 	.string "Let me guess--you drove them away?$"
 
-SlateportCity_Text_1DF0FE: @ 81DF0FE
+SlateportCity_Text_MaybeThisTrainer: @ 81DF0FE
 	.string "SCOTT: Hmm…\n"
 	.string "Maybe, just maybe, this TRAINER…$"
 
-SlateportCity_Text_1DF12B: @ 81DF12B
+SlateportCity_Text_LetsRegisterEachOther: @ 81DF12B
 	.string "SCOTT: All right! I think you're going\n"
 	.string "to become a good friend.\p"
 	.string "So, let's register each other in our\n"
 	.string "POKéNAVS.\p"
 	.string "… … … … … …$"
 
-SlateportCity_Text_1DF1A6: @ 81DF1A6
+SlateportCity_Text_RegisteredScott: @ 81DF1A6
 	.string "Registered this SCOTT person\n"
 	.string "in the POKéNAV.$"
 
-SlateportCity_Text_1DF1D3: @ 81DF1D3
+SlateportCity_Text_KeepEyeOnTrainersBeSeeingYou: @ 81DF1D3
 	.string "SCOTT: What I'd like to do is tag along\n"
 	.string "with you, but I do want to keep an eye\l"
 	.string "on the talents of other people, too.\p"
@@ -1363,7 +1366,7 @@ SlateportCity_Text_1DF1D3: @ 81DF1D3
 	.string "a bit more.\p"
 	.string "Be seeing you, {PLAYER}{KUN}!$"
 
-SlateportCity_Text_1DF28C: @ 81DF28C
+SlateportCity_Text_TakingBattleTentChallenge: @ 81DF28C
 	.string "SCOTT: Oh, hey!\n"
 	.string "If it isn't {PLAYER}{KUN}!\p"
 	.string "{PLAYER}{KUN}, let me guess--you're going\n"
diff --git a/data/maps/SlateportCity_Harbor/map.json b/data/maps/SlateportCity_Harbor/map.json
index c61c5a5e6..c9aaf1d7a 100644
--- a/data/maps/SlateportCity_Harbor/map.json
+++ b/data/maps/SlateportCity_Harbor/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Harbor_EventScript_20CAF1",
+      "script": "SlateportCity_Harbor_EventScript_FerryAttendant",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Harbor_EventScript_20CC52",
+      "script": "SlateportCity_Harbor_EventScript_Sailor",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Harbor_EventScript_20CC99",
+      "script": "SlateportCity_Harbor_EventScript_FatMan",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_Harbor_EventScript_20CCA2",
+      "script": "SlateportCity_Harbor_EventScript_CaptStern",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_HARBOR_CAPTAIN_STERN"
     },
     {
@@ -157,7 +157,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
-      "script": "SlateportCity_Harbor_EventScript_20C9BB"
+      "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger0"
     },
     {
       "type": "trigger",
@@ -166,7 +166,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
-      "script": "SlateportCity_Harbor_EventScript_20C9C7"
+      "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger1"
     },
     {
       "type": "trigger",
@@ -175,7 +175,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
-      "script": "SlateportCity_Harbor_EventScript_20C9D3"
+      "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger2"
     },
     {
       "type": "trigger",
@@ -184,7 +184,7 @@
       "elevation": 3,
       "var": "VAR_SLATEPORT_HARBOR_STATE",
       "var_value": "1",
-      "script": "SlateportCity_Harbor_EventScript_20C9DF"
+      "script": "SlateportCity_Harbor_EventScript_AquaEscapeTrigger3"
     }
   ],
   "bg_events": []
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index 83f4b8011..bf30da747 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -6,58 +6,58 @@ SlateportCity_Harbor_OnTransition: @ 820C983
 	setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13
 	setvar VAR_TEMP_1, 0
 	compare VAR_SLATEPORT_HARBOR_STATE, 1
-	call_if_eq SlateportCity_Harbor_EventScript_20C9A9
-	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20C9A5
+	call_if_eq SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene
+	call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_ShowSSTidal
 	end
 
-SlateportCity_Harbor_EventScript_20C9A5:: @ 820C9A5
+SlateportCity_Harbor_EventScript_ShowSSTidal:: @ 820C9A5
 	clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_SS_TIDAL
 	return
 
-SlateportCity_Harbor_EventScript_20C9A9:: @ 820C9A9
+SlateportCity_Harbor_EventScript_ReadyAquaEscapeScene:: @ 820C9A9
 	savebgm MUS_AQA_0
 	setobjectxyperm 4, 12, 13
 	setobjectmovementtype 4, MOVEMENT_TYPE_FACE_LEFT
 	setflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS
 	return
 
-SlateportCity_Harbor_EventScript_20C9BB:: @ 820C9BB
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger0:: @ 820C9BB
 	lockall
 	setvar VAR_0x8008, 0
-	goto SlateportCity_Harbor_EventScript_20C9F5
+	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_20C9C7:: @ 820C9C7
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger1:: @ 820C9C7
 	lockall
 	setvar VAR_0x8008, 1
-	goto SlateportCity_Harbor_EventScript_20C9F5
+	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_20C9D3:: @ 820C9D3
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger2:: @ 820C9D3
 	lockall
 	setvar VAR_0x8008, 2
-	goto SlateportCity_Harbor_EventScript_20C9F5
+	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_20C9DF:: @ 820C9DF
+SlateportCity_Harbor_EventScript_AquaEscapeTrigger3:: @ 820C9DF
 	lockall
 	setvar VAR_0x8008, 3
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CAEF
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_PlayerWalkUp
 	waitmovement 0
-	goto SlateportCity_Harbor_EventScript_20C9F5
+	goto SlateportCity_Harbor_EventScript_AquaEscapeScene
 	end
 
-SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
+SlateportCity_Harbor_EventScript_AquaEscapeScene:: @ 820C9F5
 	applymovement 7, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	applymovement 6, Common_Movement_WalkInPlaceFastestDown
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox SlateportCity_Harbor_Text_20D291, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove, MSGBOX_DEFAULT
 	closemessage
-	applymovement 6, SlateportCity_Harbor_Movement_20CAC8
-	applymovement 7, SlateportCity_Harbor_Movement_20CAC8
-	applymovement 8, SlateportCity_Harbor_Movement_20CAD2
+	applymovement 6, SlateportCity_Harbor_Movement_AquaBoardSub
+	applymovement 7, SlateportCity_Harbor_Movement_AquaBoardSub
+	applymovement 8, SlateportCity_Harbor_Movement_SubmarineExit
 	waitmovement 0
 	removeobject 6
 	removeobject 7
@@ -66,14 +66,14 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	setflag FLAG_MET_TEAM_AQUA_HARBOR
 	setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT
 	compare VAR_0x8008, 0
-	call_if_eq SlateportCity_Harbor_EventScript_20CA89
+	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer0
 	compare VAR_0x8008, 1
-	call_if_eq SlateportCity_Harbor_EventScript_20CA9E
+	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer1
 	compare VAR_0x8008, 2
-	call_if_eq SlateportCity_Harbor_EventScript_20CAB3
+	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer
 	compare VAR_0x8008, 3
-	call_if_eq SlateportCity_Harbor_EventScript_20CAB3
-	msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT
+	call_if_eq SlateportCity_Harbor_EventScript_SternApproachPlayer
+	msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_1_BLOCKING_ENTRANCE
 	setflag FLAG_HIDE_AQUA_HIDEOUT_1F_GRUNT_2_BLOCKING_ENTRANCE
@@ -82,42 +82,43 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5
 	releaseall
 	end
 
-SlateportCity_Harbor_EventScript_20CA89:: @ 820CA89
-	applymovement 4, SlateportCity_Harbor_Movement_20CAE0
+SlateportCity_Harbor_EventScript_SternApproachPlayer0:: @ 820CA89
+	applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer0
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_20CA9E:: @ 820CA9E
-	applymovement 4, SlateportCity_Harbor_Movement_20CAE6
+SlateportCity_Harbor_EventScript_SternApproachPlayer1:: @ 820CA9E
+	applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer1
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_20CAB3:: @ 820CAB3
-	applymovement 4, SlateportCity_Harbor_Movement_20CAEB
+SlateportCity_Harbor_EventScript_SternApproachPlayer:: @ 820CAB3
+	applymovement 4, SlateportCity_Harbor_Movement_SternApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_Movement_20CAC8: @ 820CAC8
+SlateportCity_Harbor_Movement_AquaBoardSub: @ 820CAC8
 	delay_16
 	delay_16
 	jump_up
 	set_invisible
 	step_end
 
-SlateportCity_Harbor_Movement_20CACD: @ 820CACD
+@ Unused, Archie instead shares above identical movement script with Grunt
+SlateportCity_Harbor_Movement_ArchieBoardSub: @ 820CACD
 	delay_16
 	delay_16
 	jump_up
 	set_invisible
 	step_end
 
-SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2
+SlateportCity_Harbor_Movement_SubmarineExit: @ 820CAD2
 	delay_16
 	delay_16
 	delay_16
@@ -133,7 +134,7 @@ SlateportCity_Harbor_Movement_20CAD2: @ 820CAD2
 	walk_fast_right
 	step_end
 
-SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0
+SlateportCity_Harbor_Movement_SternApproachPlayer0: @ 820CAE0
 	walk_left
 	walk_left
 	walk_left
@@ -141,305 +142,305 @@ SlateportCity_Harbor_Movement_20CAE0: @ 820CAE0
 	walk_up
 	step_end
 
-SlateportCity_Harbor_Movement_20CAE6: @ 820CAE6
+SlateportCity_Harbor_Movement_SternApproachPlayer1: @ 820CAE6
 	walk_left
 	walk_left
 	walk_up
 	walk_left
 	step_end
 
-SlateportCity_Harbor_Movement_20CAEB: @ 820CAEB
+SlateportCity_Harbor_Movement_SternApproachPlayer: @ 820CAEB
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-SlateportCity_Harbor_Movement_20CAEF: @ 820CAEF
+SlateportCity_Harbor_Movement_PlayerWalkUp: @ 820CAEF
 	walk_up
 	step_end
 
-SlateportCity_Harbor_EventScript_20CAF1:: @ 820CAF1
+SlateportCity_Harbor_EventScript_FerryAttendant:: @ 820CAF1
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CB06
-	msgbox SlateportCity_Harbor_Text_20CE20, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_AskForTicket
+	msgbox SlateportCity_Harbor_Text_FerryServiceUnavailable, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06
-	msgbox SlateportCity_Harbor_Text_20CE87, MSGBOX_DEFAULT
-	message SlateportCity_Harbor_Text_20CF1C
+SlateportCity_Harbor_EventScript_AskForTicket:: @ 820CB06
+	msgbox SlateportCity_Harbor_Text_MayISeeYourTicket, MSGBOX_DEFAULT
+	message SlateportCity_Harbor_Text_FlashedTicketWhereTo
 	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CB1A
+	goto SlateportCity_Harbor_EventScript_ChooseDestination
 	end
 
-SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A
-	goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_20CB50
+SlateportCity_Harbor_EventScript_ChooseDestination:: @ 820CB1A
+	goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier
 	multichoicedefault 18, 8, MULTI_SSTIDAL_SLATEPORT_NO_BF, 2, 0
 	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CB92
-	case 1, SlateportCity_Harbor_EventScript_20CC2D
-	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CC2D
+	case 0, SlateportCity_Harbor_EventScript_Lilycove
+	case 1, SlateportCity_Harbor_EventScript_CancelDestinationSelect
+	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_CancelDestinationSelect
 	end
 
-SlateportCity_Harbor_EventScript_20CB50:: @ 820CB50
+SlateportCity_Harbor_EventScript_ChooseDestinationWithBattleFrontier:: @ 820CB50
 	multichoicedefault 17, 6, MULTI_SSTIDAL_SLATEPORT_WITH_BF, 2, 0
 	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CB92
-	case 1, SlateportCity_Harbor_EventScript_20CBBA
-	case 2, SlateportCity_Harbor_EventScript_20CC2D
-	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CC2D
+	case 0, SlateportCity_Harbor_EventScript_Lilycove
+	case 1, SlateportCity_Harbor_EventScript_BattleFrontier
+	case 2, SlateportCity_Harbor_EventScript_CancelDestinationSelect
+	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_CancelDestinationSelect
 	end
 
-SlateportCity_Harbor_EventScript_20CB88:: @ 820CB88
-	msgbox SlateportCity_Harbor_Text_20CEC1, MSGBOX_DEFAULT
+@ Unused. Should be impossible for player to reach Ferry without having received SS Tidal ticket
+SlateportCity_Harbor_EventScript_NoTicket:: @ 820CB88
+	msgbox SlateportCity_Harbor_Text_YouMustHaveTicket, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CB92:: @ 820CB92
-	msgbox SlateportCity_Harbor_Text_20CF93, MSGBOX_YESNO
+SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92
+	msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_20CBDD
+	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
 	setvar VAR_PORTHOLE_STATE, 1
-	call SlateportCity_Harbor_EventScript_20CBE9
+	call SlateportCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CBBA:: @ 820CBBA
-	msgbox SlateportCity_Harbor_Text_20CFAE, MSGBOX_YESNO
+SlateportCity_Harbor_EventScript_BattleFrontier:: @ 820CBBA
+	msgbox SlateportCity_Harbor_Text_BattleFrontierItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_20CBDD
-	call SlateportCity_Harbor_EventScript_20CBE9
+	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
+	call SlateportCity_Harbor_EventScript_BoardFerry
 	warp MAP_BATTLE_FRONTIER_OUTSIDE_WEST, 255, 19, 67
 	waitstate
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CBDD:: @ 820CBDD
-	message SlateportCity_Harbor_Text_20CFFA
+SlateportCity_Harbor_EventScript_ChooseNewDestination:: @ 820CBDD
+	message SlateportCity_Harbor_Text_WhereWouldYouLikeToGo
 	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CB1A
+	goto SlateportCity_Harbor_EventScript_ChooseDestination
 	end
 
-SlateportCity_Harbor_EventScript_20CBE9:: @ 820CBE9
-	msgbox SlateportCity_Harbor_Text_20CFCB, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_BoardFerry:: @ 820CBE9
+	msgbox SlateportCity_Harbor_Text_PleaseBoardFerry, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	delay 30
 	hideobjectat VAR_LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq SlateportCity_Harbor_EventScript_20CC42
+	call_if_eq SlateportCity_Harbor_EventScript_BoardFerryNorth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq SlateportCity_Harbor_EventScript_20CC37
+	call_if_eq SlateportCity_Harbor_EventScript_BoardFerryEast
 	delay 30
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
 	setvar VAR_0x8004, 5
 	call Common_EventScript_FerryDepart
 	return
 
-SlateportCity_Harbor_EventScript_20CC2D:: @ 820CC2D
-	msgbox SlateportCity_Harbor_Text_20CF71, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_CancelDestinationSelect:: @ 820CC2D
+	msgbox SlateportCity_Harbor_Text_SailAnotherTime, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CC37:: @ 820CC37
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC4D
+SlateportCity_Harbor_EventScript_BoardFerryEast:: @ 820CC37
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryEast
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_EventScript_20CC42:: @ 820CC42
-	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_20CC50
+SlateportCity_Harbor_EventScript_BoardFerryNorth:: @ 820CC42
+	applymovement EVENT_OBJ_ID_PLAYER, SlateportCity_Harbor_Movement_BoardFerryNorth
 	waitmovement 0
 	return
 
-SlateportCity_Harbor_Movement_20CC4D: @ 820CC4D
+SlateportCity_Harbor_Movement_BoardFerryEast: @ 820CC4D
 	walk_right
 	walk_in_place_fastest_up
 	step_end
 
-SlateportCity_Harbor_Movement_20CC50: @ 820CC50
+SlateportCity_Harbor_Movement_BoardFerryNorth: @ 820CC50
 	walk_up
 	step_end
 
-SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52
+SlateportCity_Harbor_EventScript_Sailor:: @ 820CC52
 	lock
 	faceplayer
-	goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CC89
+	goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather
 	setvar VAR_0x8004, 0
-	call_if_set FLAG_DEFEATED_KYOGRE, SlateportCity_Harbor_EventScript_20CC93
-	call_if_set FLAG_DEFEATED_GROUDON, SlateportCity_Harbor_EventScript_20CC93
-	compare VAR_0x8004, 2
-	goto_if_eq SlateportCity_Harbor_EventScript_20CC89
-	msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT
+	call_if_set FLAG_DEFEATED_KYOGRE, SlateportCity_Harbor_EventScript_CountDefeatedLegendary
+	call_if_set FLAG_DEFEATED_GROUDON, SlateportCity_Harbor_EventScript_CountDefeatedLegendary
+	compare VAR_0x8004, 2  @ Defeated both
+	goto_if_eq SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather
+	msgbox SlateportCity_Harbor_Text_AbnormalWeather, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CC89:: @ 820CC89
-	msgbox SlateportCity_Harbor_Text_20D01C, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_SailorNoAbnormalWeather:: @ 820CC89
+	msgbox SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CC93:: @ 820CC93
+SlateportCity_Harbor_EventScript_CountDefeatedLegendary:: @ 820CC93
 	addvar VAR_0x8004, 1
 	return
 
-SlateportCity_Harbor_EventScript_20CC99:: @ 820CC99
-	msgbox SlateportCity_Harbor_Text_20D194, MSGBOX_NPC
+SlateportCity_Harbor_EventScript_FatMan:: @ 820CC99
+	msgbox SlateportCity_Harbor_Text_SubTooSmallForMe, MSGBOX_NPC
 	end
 
-SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2
+SlateportCity_Harbor_EventScript_CaptStern:: @ 820CCA2
 	lock
 	faceplayer
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00
-	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6
-	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment
+	goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_NeedDive
+	goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_TeamAquaLeftNeedDive
 	compare VAR_SLATEPORT_HARBOR_STATE, 2
-	goto_if_eq SlateportCity_Harbor_EventScript_20CCDF
-	msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT
+	goto_if_eq SlateportCity_Harbor_EventScript_WhyStealSubmarine
+	msgbox SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF
-	msgbox SlateportCity_Harbor_Text_20D35A, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_WhyStealSubmarine:: @ 820CCDF
+	msgbox SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9
+SlateportCity_Harbor_EventScript_TeamAquaLeftNeedDive:: @ 820CCE9
 	setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE
-	msgbox SlateportCity_Harbor_Text_20D42B, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_TeamAquaLeftNeedDive, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CCF6:: @ 820CCF6
-	msgbox SlateportCity_Harbor_Text_20D58A, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_NeedDive:: @ 820CCF6
+	msgbox SlateportCity_Harbor_Text_NeedDiveToCatchSub, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CD00:: @ 820CD00
+SlateportCity_Harbor_EventScript_CaptSternFerryOrScannerComment:: @ 820CD00
 	compare VAR_TEMP_1, 1
-	goto_if_eq SlateportCity_Harbor_EventScript_20CE11
+	goto_if_eq SlateportCity_Harbor_EventScript_TradedScanner
 	checkitem ITEM_SCANNER, 1
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_Harbor_EventScript_20CD38
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CD2E
-	msgbox SlateportCity_Harbor_Text_20D65C, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_Harbor_EventScript_AskToTradeScanner
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_FerryFinished
+	msgbox SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CD2E:: @ 820CD2E
-	msgbox SlateportCity_Harbor_Text_20D6CB, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_FerryFinished:: @ 820CD2E
+	msgbox SlateportCity_Harbor_Text_FinishedMakingFerry, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CD38:: @ 820CD38
-	message SlateportCity_Harbor_Text_20D76C
+SlateportCity_Harbor_EventScript_AskToTradeScanner:: @ 820CD38
+	message SlateportCity_Harbor_Text_WouldYouTradeScanner
 	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CD44
+	goto SlateportCity_Harbor_EventScript_ChooseScannerTrade
 	end
 
-SlateportCity_Harbor_EventScript_20CD44:: @ 820CD44
+SlateportCity_Harbor_EventScript_ChooseScannerTrade:: @ 820CD44
 	multichoice 0, 0, MULTI_STERN_DEEPSEA, 0
 	switch VAR_RESULT
-	case 0, SlateportCity_Harbor_EventScript_20CD7B
-	case 1, SlateportCity_Harbor_EventScript_20CDBB
-	case 2, SlateportCity_Harbor_EventScript_20CDFB
-	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_20CDFB
+	case 0, SlateportCity_Harbor_EventScript_DeepSeaTooth
+	case 1, SlateportCity_Harbor_EventScript_DeepSeaScale
+	case 2, SlateportCity_Harbor_EventScript_DeclineTrade
+	case MULTI_B_PRESSED, SlateportCity_Harbor_EventScript_DeclineTrade
 	end
 
-SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B
-	msgbox SlateportCity_Harbor_Text_20D8BC, MSGBOX_YESNO
+SlateportCity_Harbor_EventScript_DeepSeaTooth:: @ 820CD7B
+	msgbox SlateportCity_Harbor_Text_TradeForDeepSeaTooth, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_20CE05
+	goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade
 	giveitem_std ITEM_DEEP_SEA_TOOTH
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT
 	setflag FLAG_EXCHANGED_SCANNER
-	goto SlateportCity_Harbor_EventScript_20CE11
+	goto SlateportCity_Harbor_EventScript_TradedScanner
 	end
 
-SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB
-	msgbox SlateportCity_Harbor_Text_20D8F1, MSGBOX_YESNO
+SlateportCity_Harbor_EventScript_DeepSeaScale:: @ 820CDBB
+	msgbox SlateportCity_Harbor_Text_TradeForDeepSeaScale, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq SlateportCity_Harbor_EventScript_20CE05
+	goto_if_eq SlateportCity_Harbor_EventScript_ChooseDifferentTrade
 	giveitem_std ITEM_DEEP_SEA_SCALE
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	takeitem ITEM_SCANNER, 1
-	msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_HandedScannerToStern, MSGBOX_DEFAULT
 	setflag FLAG_EXCHANGED_SCANNER
-	goto SlateportCity_Harbor_EventScript_20CE11
+	goto SlateportCity_Harbor_EventScript_TradedScanner
 	end
 
-SlateportCity_Harbor_EventScript_20CDFB:: @ 820CDFB
-	msgbox SlateportCity_Harbor_Text_20D841, MSGBOX_DEFAULT
+SlateportCity_Harbor_EventScript_DeclineTrade:: @ 820CDFB
+	msgbox SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_EventScript_20CE05:: @ 820CE05
-	message SlateportCity_Harbor_Text_20D926
+SlateportCity_Harbor_EventScript_ChooseDifferentTrade:: @ 820CE05
+	message SlateportCity_Harbor_Text_WhichOneDoYouWant
 	waitmessage
-	goto SlateportCity_Harbor_EventScript_20CD44
+	goto SlateportCity_Harbor_EventScript_ChooseScannerTrade
 	end
 
-SlateportCity_Harbor_EventScript_20CE11:: @ 820CE11
+SlateportCity_Harbor_EventScript_TradedScanner:: @ 820CE11
 	setvar VAR_TEMP_1, 1
-	msgbox SlateportCity_Harbor_Text_20D970, MSGBOX_DEFAULT
+	msgbox SlateportCity_Harbor_Text_ThisWillHelpResearch, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_Harbor_Text_20CE20: @ 820CE20
+SlateportCity_Harbor_Text_FerryServiceUnavailable: @ 820CE20
 	.string "I beg your pardon?\n"
 	.string "You're looking for a ship?\p"
 	.string "I'm sorry, the ferry service isn't\n"
 	.string "available at present…$"
 
-SlateportCity_Harbor_Text_20CE87: @ 820CE87
+SlateportCity_Harbor_Text_MayISeeYourTicket: @ 820CE87
 	.string "Hello, are you here for the ferry?\n"
 	.string "May I see your TICKET?$"
 
-
-SlateportCity_Harbor_Text_20CEC1: @ 820CEC1
+SlateportCity_Harbor_Text_YouMustHaveTicket: @ 820CEC1
 	.string "{PLAYER} doesn't have the TICKET…\p"
 	.string "I'm terribly sorry.\p"
 	.string "You must have a TICKET to board\n"
 	.string "the ferry.$"
 
-SlateportCity_Harbor_Text_20CF1C: @ 820CF1C
+SlateportCity_Harbor_Text_FlashedTicketWhereTo: @ 820CF1C
 	.string "{PLAYER} flashed the TICKET.\p"
 	.string "Perfect! That's all you need!\p"
 	.string "And where would you like to go?$"
 
-SlateportCity_Harbor_Text_20CF71: @ 820CF71
+SlateportCity_Harbor_Text_SailAnotherTime: @ 820CF71
 	.string "Please sail with us another time!$"
 
-SlateportCity_Harbor_Text_20CF93: @ 820CF93
+SlateportCity_Harbor_Text_LilycoveItIs: @ 820CF93
 	.string "LILYCOVE CITY it is, then!$"
 
-SlateportCity_Harbor_Text_20CFAE: @ 820CFAE
+SlateportCity_Harbor_Text_BattleFrontierItIs: @ 820CFAE
 	.string "BATTLE FRONTIER it is, then!$"
 
-SlateportCity_Harbor_Text_20CFCB: @ 820CFCB
+SlateportCity_Harbor_Text_PleaseBoardFerry: @ 820CFCB
 	.string "Please board the ferry and wait for\n"
 	.string "departure.$"
 
-SlateportCity_Harbor_Text_20CFFA: @ 820CFFA
+SlateportCity_Harbor_Text_WhereWouldYouLikeToGo: @ 820CFFA
 	.string "Then, where would you like to go?$"
 
-SlateportCity_Harbor_Text_20D01C: @ 820D01C
+SlateportCity_Harbor_Text_LoveToGoDeepUnderwaterSomeday: @ 820D01C
 	.string "A journey to the bottom of the sea…\n"
 	.string "I wonder what it'd be like?\p"
 	.string "I'd love to go deep underwater like\n"
 	.string "that someday.$"
 
-SlateportCity_Harbor_Text_20D08E: @ 820D08E
+SlateportCity_Harbor_Text_AbnormalWeather: @ 820D08E
 	.string "For a ship to sail safely, we need to\n"
 	.string "know about the weather!\p"
 	.string "Speaking of weather, I heard something\n"
@@ -449,19 +450,19 @@ SlateportCity_Harbor_Text_20D08E: @ 820D08E
 	.string "You should visit the WEATHER INSTITUTE\n"
 	.string "and ask around!$"
 
-SlateportCity_Harbor_Text_20D194: @ 820D194
+SlateportCity_Harbor_Text_SubTooSmallForMe: @ 820D194
 	.string "I wanted to go with CAPT. STERN on\n"
 	.string "the ocean floor exploration.\p"
 	.string "But the sub's too small for me.\p"
 	.string "If I squeezed in, there wouldn't be\n"
 	.string "any room for the CAPTAIN…$"
 
-SlateportCity_Harbor_Text_20D232: @ 820D232
+SlateportCity_Harbor_Text_SameThugsTriedToRobAtMuseum: @ 820D232
 	.string "CAPT. STERN: Those thugs…\p"
 	.string "They're the same lot who tried to rob\n"
 	.string "the DEVON GOODS at the MUSEUM.$"
 
-SlateportCity_Harbor_Text_20D291: @ 820D291
+SlateportCity_Harbor_Text_ArchieYouAgainHideoutInLilycove: @ 820D291
 	.string "ARCHIE: Oh?\n"
 	.string "Not you again…\p"
 	.string "You are tenacious to track us here,\n"
@@ -472,7 +473,7 @@ SlateportCity_Harbor_Text_20D291: @ 820D291
 	.string "HIDEOUT in LILYCOVE CITY?\p"
 	.string "Fwahahahaha…$"
 
-SlateportCity_Harbor_Text_20D35A: @ 820D35A
+SlateportCity_Harbor_Text_CaptSternWhyStealMySubmarine: @ 820D35A
 	.string "CAPT. STERN: Why…\p"
 	.string "Why would TEAM AQUA steal my\n"
 	.string "SUBMARINE EXPLORER 1?\p"
@@ -481,7 +482,7 @@ SlateportCity_Harbor_Text_20D35A: @ 820D35A
 	.string "But even if I were to chase them,\n"
 	.string "I don't stand a chance against them…$"
 
-SlateportCity_Harbor_Text_20D42B: @ 820D42B
+SlateportCity_Harbor_Text_TeamAquaLeftNeedDive: @ 820D42B
 	.string "CAPT. STERN: Oh, {PLAYER}{KUN}…\p"
 	.string "Okay… So TEAM AQUA left before you\n"
 	.string "could stop them…\p"
@@ -496,7 +497,7 @@ SlateportCity_Harbor_Text_20D42B: @ 820D42B
 	.string "A lot of divers live out there, so\n"
 	.string "someone might teach you…$"
 
-SlateportCity_Harbor_Text_20D58A: @ 820D58A
+SlateportCity_Harbor_Text_NeedDiveToCatchSub: @ 820D58A
 	.string "CAPT. STERN: Trying to catch a\n"
 	.string "submarine… It's impossible.\p"
 	.string "You would need a POKéMON that knows\n"
@@ -506,13 +507,13 @@ SlateportCity_Harbor_Text_20D58A: @ 820D58A
 	.string "A lot of divers live out there, so\n"
 	.string "someone might teach you…$"
 
-SlateportCity_Harbor_Text_20D65C: @ 820D65C
+SlateportCity_Harbor_Text_WontBeLongBeforeWeFinishFerry: @ 820D65C
 	.string "CAPT. STERN: Oh, yes.\n"
 	.string "MR. BRINEY came to our SHIPYARD.\p"
 	.string "It won't be long now before we finish\n"
 	.string "making the ferry!$"
 
-SlateportCity_Harbor_Text_20D6CB: @ 820D6CB
+SlateportCity_Harbor_Text_FinishedMakingFerry: @ 820D6CB
 	.string "CAPT. STERN: {PLAYER}{KUN}!\p"
 	.string "We finally finished making the ferry\n"
 	.string "S.S. TIDAL!\p"
@@ -520,7 +521,7 @@ SlateportCity_Harbor_Text_20D6CB: @ 820D6CB
 	.string "your friend MR. BRINEY.\p"
 	.string "Please go for a short cruise on it!$"
 
-SlateportCity_Harbor_Text_20D76C: @ 820D76C
+SlateportCity_Harbor_Text_WouldYouTradeScanner: @ 820D76C
 	.string "CAPT. STERN: Oh?\n"
 	.string "{PLAYER}{KUN}, that item you have…\p"
 	.string "That's a SCANNER! That would sure\n"
@@ -530,27 +531,27 @@ SlateportCity_Harbor_Text_20D76C: @ 820D76C
 	.string "Like, say, a DEEPSEATOOTH or\n"
 	.string "a DEEPSEASCALE that I have?$"
 
-SlateportCity_Harbor_Text_20D841: @ 820D841
+SlateportCity_Harbor_Text_IfYouWantToTradeLetMeKnow: @ 820D841
 	.string "CAPT. STERN: Are you certain?\n"
 	.string "It's useless to you, {PLAYER}{KUN}…\p"
 	.string "Well, okay, then. If you want to trade\n"
 	.string "your SCANNER, let me know.$"
 
-SlateportCity_Harbor_Text_20D8BC: @ 820D8BC
+SlateportCity_Harbor_Text_TradeForDeepSeaTooth: @ 820D8BC
 	.string "CAPT. STERN: So you'll trade it for\n"
 	.string "my DEEPSEATOOTH?$"
 
-SlateportCity_Harbor_Text_20D8F1: @ 820D8F1
+SlateportCity_Harbor_Text_TradeForDeepSeaScale: @ 820D8F1
 	.string "CAPT. STERN: So you'll trade it for\n"
 	.string "my DEEPSEASCALE?$"
 
-SlateportCity_Harbor_Text_20D926: @ 820D926
+SlateportCity_Harbor_Text_WhichOneDoYouWant: @ 820D926
 	.string "CAPT. STERN: Which one do you want?$"
 
-SlateportCity_Harbor_Text_20D94A: @ 820D94A
+SlateportCity_Harbor_Text_HandedScannerToStern: @ 820D94A
 	.string "{PLAYER} handed the SCANNER to\n"
 	.string "CAPT. STERN.$"
 
-SlateportCity_Harbor_Text_20D970: @ 820D970
+SlateportCity_Harbor_Text_ThisWillHelpResearch: @ 820D970
 	.string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n"
 	.string "This will help our research a lot!$"
diff --git a/data/maps/SlateportCity_House2/map.json b/data/maps/SlateportCity_House/map.json
index a6a686cf7..9052e19b1 100644
--- a/data/maps/SlateportCity_House2/map.json
+++ b/data/maps/SlateportCity_House/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_SLATEPORT_CITY_HOUSE2",
-  "name": "SlateportCity_House2",
+  "id": "MAP_SLATEPORT_CITY_HOUSE",
+  "name": "SlateportCity_House",
   "layout": "LAYOUT_HOUSE2",
   "music": "MUS_FINECITY",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_House2_EventScript_20D9AF",
+      "script": "SlateportCity_House_EventScript_PokefanM",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_House2_EventScript_20D9B8",
+      "script": "SlateportCity_House_EventScript_Girl",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_House/scripts.inc b/data/maps/SlateportCity_House/scripts.inc
new file mode 100644
index 000000000..13b0caf91
--- /dev/null
+++ b/data/maps/SlateportCity_House/scripts.inc
@@ -0,0 +1,23 @@
+SlateportCity_House_MapScripts:: @ 820D9AE
+	.byte 0
+
+SlateportCity_House_EventScript_PokefanM:: @ 820D9AF
+	msgbox SlateportCity_House_Text_NatureToDoWithStatGains, MSGBOX_NPC
+	end
+
+SlateportCity_House_EventScript_Girl:: @ 820D9B8
+	msgbox SlateportCity_House_Text_MustBeGoingToBattleTent, MSGBOX_NPC
+	end
+
+SlateportCity_House_Text_NatureToDoWithStatGains: @ 820D9C1
+	.string "My POKéMON has a HASTY nature.\p"
+	.string "It has higher SPEED compared to\n"
+	.string "my other POKéMON.\p"
+	.string "Maybe their nature has something to\n"
+	.string "do with the stat gains of POKéMON.$"
+
+SlateportCity_House_Text_MustBeGoingToBattleTent: @ 820DA59
+	.string "You're a TRAINER, aren't you?\p"
+	.string "Since you came to SLATEPORT CITY,\n"
+	.string "you must be going to the BATTLE TENT.$"
+
diff --git a/data/maps/SlateportCity_House1/scripts.inc b/data/maps/SlateportCity_House1/scripts.inc
deleted file mode 100644
index 3e80144c6..000000000
--- a/data/maps/SlateportCity_House1/scripts.inc
+++ /dev/null
@@ -1,121 +0,0 @@
-SlateportCity_House1_MapScripts:: @ 8209AA4
-	.byte 0
-
-SlateportCity_House1_EventScript_209AA5:: @ 8209AA5
-	lock
-	faceplayer
-	msgbox SlateportCity_House1_Text_209B8E, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq SlateportCity_House1_EventScript_209AC6
-	compare VAR_RESULT, NO
-	goto_if_eq SlateportCity_House1_EventScript_209AE9
-	end
-
-SlateportCity_House1_EventScript_209AC6:: @ 8209AC6
-	msgbox SlateportCity_House1_Text_209BFF, MSGBOX_DEFAULT
-	special ChoosePartyMon
-	waitstate
-	compare VAR_0x8004, 255
-	goto_if_ne SlateportCity_House1_EventScript_209AF3
-	compare VAR_0x8004, 255
-	goto_if_eq SlateportCity_House1_EventScript_209AE9
-	end
-
-SlateportCity_House1_EventScript_209AE9:: @ 8209AE9
-	msgbox SlateportCity_House1_Text_209D42, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_EventScript_209AF3:: @ 8209AF3
-	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
-	compare VAR_RESULT, SPECIES_EGG
-	goto_if_eq SlateportCity_House1_EventScript_209B46
-	special TV_CopyNicknameToStringVar1AndEnsureTerminated
-	special TV_CheckMonOTIDEqualsPlayerID
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_House1_EventScript_209B50
-	specialvar VAR_RESULT, MonOTNameMatchesPlayer
-	special TV_CopyNicknameToStringVar1AndEnsureTerminated
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_House1_EventScript_209B50
-	msgbox SlateportCity_House1_Text_209C2B, MSGBOX_YESNO
-	compare VAR_RESULT, YES
-	goto_if_eq SlateportCity_House1_EventScript_209B5A
-	compare VAR_RESULT, NO
-	goto_if_eq SlateportCity_House1_EventScript_209AE9
-	end
-
-SlateportCity_House1_EventScript_209B46:: @ 8209B46
-	msgbox SlateportCity_House1_Text_209E74, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_EventScript_209B50:: @ 8209B50
-	msgbox SlateportCity_House1_Text_209DF0, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_EventScript_209B5A:: @ 8209B5A
-	msgbox SlateportCity_House1_Text_209CA4, MSGBOX_DEFAULT
-	call Common_EventScript_NameReceivedPartyMon
-	specialvar VAR_RESULT, TV_PutNameRaterShowOnTheAirIfNicknameChanged
-	special TV_CopyNicknameToStringVar1AndEnsureTerminated
-	compare VAR_RESULT, 1
-	goto_if_eq SlateportCity_House1_EventScript_209B84
-	msgbox SlateportCity_House1_Text_209D5E, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_EventScript_209B84:: @ 8209B84
-	msgbox SlateportCity_House1_Text_209CD4, MSGBOX_DEFAULT
-	release
-	end
-
-SlateportCity_House1_Text_209B8E: @ 8209B8E
-	.string "Hi, hi! I'm the NAME RATER!\n"
-	.string "I'm the fortune-teller of names!\p"
-	.string "I shall be pleased to rate your\n"
-	.string "POKéMON's nickname.$"
-
-SlateportCity_House1_Text_209BFF: @ 8209BFF
-	.string "Which POKéMON's nickname should\n"
-	.string "I critique?$"
-
-SlateportCity_House1_Text_209C2B: @ 8209C2B
-	.string "Hmmm… {STR_VAR_1}, is it? That is\n"
-	.string "quite a fine name you bestowed.\p"
-	.string "But! What say you, if I were to\n"
-	.string "suggest a slightly better name?$"
-
-SlateportCity_House1_Text_209CA4: @ 8209CA4
-	.string "Ah, good. Then, what shall the new\n"
-	.string "nickname be?$"
-
-SlateportCity_House1_Text_209CD4: @ 8209CD4
-	.string "Done! From now on, this POKéMON\n"
-	.string "shall be known as {STR_VAR_1}!\p"
-	.string "It is a better name than before!\n"
-	.string "How fortunate for you!$"
-
-SlateportCity_House1_Text_209D42: @ 8209D42
-	.string "I see.\n"
-	.string "Do come visit again.$"
-
-SlateportCity_House1_Text_209D5E: @ 8209D5E
-	.string "Done! From now on, this POKéMON\n"
-	.string "shall be known as {STR_VAR_1}!\p"
-	.string "It looks no different from before,\n"
-	.string "and yet, this is vastly superior!\p"
-	.string "How fortunate for you!$"
-
-SlateportCity_House1_Text_209DF0: @ 8209DF0
-	.string "Hmmm… {STR_VAR_1} it is!\p"
-	.string "This is a magnificent nickname!\n"
-	.string "It is impeccably beyond reproach!\p"
-	.string "You'll do well to cherish your\n"
-	.string "{STR_VAR_1} now and beyond.$"
-
-SlateportCity_House1_Text_209E74: @ 8209E74
-	.string "Now, now.\n"
-	.string "That is merely an EGG!$"
-
diff --git a/data/maps/SlateportCity_House2/scripts.inc b/data/maps/SlateportCity_House2/scripts.inc
deleted file mode 100644
index 1661d8fc5..000000000
--- a/data/maps/SlateportCity_House2/scripts.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-SlateportCity_House2_MapScripts:: @ 820D9AE
-	.byte 0
-
-SlateportCity_House2_EventScript_20D9AF:: @ 820D9AF
-	msgbox SlateportCity_House2_Text_20D9C1, MSGBOX_NPC
-	end
-
-SlateportCity_House2_EventScript_20D9B8:: @ 820D9B8
-	msgbox SlateportCity_House2_Text_20DA59, MSGBOX_NPC
-	end
-
-SlateportCity_House2_Text_20D9C1: @ 820D9C1
-	.string "My POKéMON has a HASTY nature.\p"
-	.string "It has higher SPEED compared to\n"
-	.string "my other POKéMON.\p"
-	.string "Maybe their nature has something to\n"
-	.string "do with the stat gains of POKéMON.$"
-
-SlateportCity_House2_Text_20DA59: @ 820DA59
-	.string "You're a TRAINER, aren't you?\p"
-	.string "Since you came to SLATEPORT CITY,\n"
-	.string "you must be going to the BATTLE TENT.$"
-
diff --git a/data/maps/SlateportCity_House1/map.json b/data/maps/SlateportCity_NameRatersHouse/map.json
index 47943e517..1e464b9fd 100644
--- a/data/maps/SlateportCity_House1/map.json
+++ b/data/maps/SlateportCity_NameRatersHouse/map.json
@@ -1,6 +1,6 @@
 {
-  "id": "MAP_SLATEPORT_CITY_HOUSE1",
-  "name": "SlateportCity_House1",
+  "id": "MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE",
+  "name": "SlateportCity_NameRatersHouse",
   "layout": "LAYOUT_HOUSE_WITH_BED",
   "music": "MUS_FINECITY",
   "region_map_section": "MAPSEC_SLATEPORT_CITY",
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_House1_EventScript_209AA5",
+      "script": "SlateportCity_NameRatersHouse_EventScript_NameRater",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_NameRatersHouse/scripts.inc b/data/maps/SlateportCity_NameRatersHouse/scripts.inc
new file mode 100644
index 000000000..92c6b7a02
--- /dev/null
+++ b/data/maps/SlateportCity_NameRatersHouse/scripts.inc
@@ -0,0 +1,121 @@
+SlateportCity_NameRatersHouse_MapScripts:: @ 8209AA4
+	.byte 0
+
+SlateportCity_NameRatersHouse_EventScript_NameRater:: @ 8209AA5
+	lock
+	faceplayer
+	msgbox SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
+	end
+
+SlateportCity_NameRatersHouse_EventScript_ChooseMonToRate:: @ 8209AC6
+	msgbox SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname, MSGBOX_DEFAULT
+	special ChoosePartyMon
+	waitstate
+	compare VAR_0x8004, 255
+	goto_if_ne SlateportCity_NameRatersHouse_EventScript_RateMonNickname
+	compare VAR_0x8004, 255
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
+	end
+
+SlateportCity_NameRatersHouse_EventScript_DeclineNameRate:: @ 8209AE9
+	msgbox SlateportCity_NameRatersHouse_Text_DoVisitAgain, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_EventScript_RateMonNickname:: @ 8209AF3
+	specialvar VAR_RESULT, ScriptGetPartyMonSpecies
+	compare VAR_RESULT, SPECIES_EGG
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_CantRateEgg
+	special BufferMonNickname
+	special IsMonOTIDNotPlayers
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT
+	specialvar VAR_RESULT, MonOTNameNotPlayer
+	special BufferMonNickname
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT
+	msgbox SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne, MSGBOX_YESNO
+	compare VAR_RESULT, YES
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_ChangeNickname
+	compare VAR_RESULT, NO
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_DeclineNameRate
+	end
+
+SlateportCity_NameRatersHouse_EventScript_CantRateEgg:: @ 8209B46
+	msgbox SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_EventScript_PlayerNotMonsOT:: @ 8209B50
+	msgbox SlateportCity_NameRatersHouse_Text_MagnificentName, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_EventScript_ChangeNickname:: @ 8209B5A
+	msgbox SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe, MSGBOX_DEFAULT
+	call Common_EventScript_NameReceivedPartyMon
+	specialvar VAR_RESULT, TryPutNameRaterShowOnTheAir
+	special BufferMonNickname
+	compare VAR_RESULT, TRUE
+	goto_if_eq SlateportCity_NameRatersHouse_EventScript_NewNameDifferent
+	msgbox SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_EventScript_NewNameDifferent:: @ 8209B84
+	msgbox SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName, MSGBOX_DEFAULT
+	release
+	end
+
+SlateportCity_NameRatersHouse_Text_PleasedToRateMonNickname: @ 8209B8E
+	.string "Hi, hi! I'm the NAME RATER!\n"
+	.string "I'm the fortune-teller of names!\p"
+	.string "I shall be pleased to rate your\n"
+	.string "POKéMON's nickname.$"
+
+SlateportCity_NameRatersHouse_Text_CritiqueWhichMonNickname: @ 8209BFF
+	.string "Which POKéMON's nickname should\n"
+	.string "I critique?$"
+
+SlateportCity_NameRatersHouse_Text_FineNameSuggestBetterOne: @ 8209C2B
+	.string "Hmmm… {STR_VAR_1}, is it? That is\n"
+	.string "quite a fine name you bestowed.\p"
+	.string "But! What say you, if I were to\n"
+	.string "suggest a slightly better name?$"
+
+SlateportCity_NameRatersHouse_Text_WhatShallNewNameBe: @ 8209CA4
+	.string "Ah, good. Then, what shall the new\n"
+	.string "nickname be?$"
+
+SlateportCity_NameRatersHouse_Text_MonShallBeKnownAsName: @ 8209CD4
+	.string "Done! From now on, this POKéMON\n"
+	.string "shall be known as {STR_VAR_1}!\p"
+	.string "It is a better name than before!\n"
+	.string "How fortunate for you!$"
+
+SlateportCity_NameRatersHouse_Text_DoVisitAgain: @ 8209D42
+	.string "I see.\n"
+	.string "Do come visit again.$"
+
+SlateportCity_NameRatersHouse_Text_NameNoDifferentYetSuperior: @ 8209D5E
+	.string "Done! From now on, this POKéMON\n"
+	.string "shall be known as {STR_VAR_1}!\p"
+	.string "It looks no different from before,\n"
+	.string "and yet, this is vastly superior!\p"
+	.string "How fortunate for you!$"
+
+SlateportCity_NameRatersHouse_Text_MagnificentName: @ 8209DF0
+	.string "Hmmm… {STR_VAR_1} it is!\p"
+	.string "This is a magnificent nickname!\n"
+	.string "It is impeccably beyond reproach!\p"
+	.string "You'll do well to cherish your\n"
+	.string "{STR_VAR_1} now and beyond.$"
+
+SlateportCity_NameRatersHouse_Text_ThatIsMerelyAnEgg: @ 8209E74
+	.string "Now, now.\n"
+	.string "That is merely an EGG!$"
+
diff --git a/data/maps/SlateportCity_PokemonFanClub/map.json b/data/maps/SlateportCity_PokemonFanClub/map.json
index faf7e7db2..5e0e0616c 100644
--- a/data/maps/SlateportCity_PokemonFanClub/map.json
+++ b/data/maps/SlateportCity_PokemonFanClub/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A1E8",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Man",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A1F1",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Twin",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_28C943",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Reporter",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A17E",
+      "script": "SlateportCity_PokemonFanClub_EventScript_SootheBellWoman",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_209E96",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Chairman",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A20D",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Zigzagoon",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A1FA",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Skitty",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_PokemonFanClub_EventScript_20A220",
+      "script": "SlateportCity_PokemonFanClub_EventScript_Azumarill",
       "flag": "0"
     },
     {
diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
index 866bf2963..eff7edfa7 100644
--- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc
+++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc
@@ -1,272 +1,272 @@
 SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95
 	.byte 0
 
-SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96
+SlateportCity_PokemonFanClub_EventScript_Chairman:: @ 8209E96
 	lock
 	faceplayer
-	goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152
-	call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172
+	goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest
+	call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_MeetChairman
 	switch VAR_SLATEPORT_FAN_CLUB_STATE
-	case 0, SlateportCity_PokemonFanClub_EventScript_209ED2
-	case 1, SlateportCity_PokemonFanClub_EventScript_209EE5
-	case 2, SlateportCity_PokemonFanClub_EventScript_209F3B
+	case 0, SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment
+	case 1, SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon
+	case 2, SlateportCity_PokemonFanClub_EventScript_NoMoreScarves
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2
+SlateportCity_PokemonFanClub_EventScript_ChairmanFirstAssessment:: @ 8209ED2
 	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1
-	msgbox SlateportCity_PokemonFanClub_Text_20A445, MSGBOX_DEFAULT
-	goto SlateportCity_PokemonFanClub_EventScript_209F45
+	msgbox SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon, MSGBOX_DEFAULT
+	goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5
+SlateportCity_PokemonFanClub_EventScript_ChairmanTryAssessPokemon:: @ 8209EE5
 	setvar VAR_TEMP_2, 0
-	call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0
-	compare VAR_TEMP_2, 5
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA
+	call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf
+	compare VAR_TEMP_2, CONTEST_CATEGORIES_COUNT
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves
 	compare VAR_SLATEPORT_FAN_CLUB_STATE, 2
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_209F3B
-	msgbox SlateportCity_PokemonFanClub_Text_20A62A, MSGBOX_DEFAULT
-	goto SlateportCity_PokemonFanClub_EventScript_209F45
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoMoreScarves
+	msgbox SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing, MSGBOX_DEFAULT
+	goto SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B
-	msgbox SlateportCity_PokemonFanClub_Text_20A9E1, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_NoMoreScarves:: @ 8209F3B
+	msgbox SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45
-	msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_ChairmanAssessLeadMon:: @ 8209F45
+	msgbox SlateportCity_PokemonFanClub_Text_HmHmISee, MSGBOX_DEFAULT
 	setvar VAR_TEMP_1, 0
-	call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_20A13B
-	call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_20A124
-	call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_20A10D
-	call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_20A0F6
-	call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_20A0DF
+	call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonTough
+	call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonSmart
+	call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonCute
+	call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty
+	call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_CheckMonCool
 	bufferleadmonspeciesname 0
 	switch VAR_TEMP_1
-	case 0, SlateportCity_PokemonFanClub_EventScript_209FD6
-	case 1, SlateportCity_PokemonFanClub_EventScript_209FE0
-	case 2, SlateportCity_PokemonFanClub_EventScript_20A011
-	case 3, SlateportCity_PokemonFanClub_EventScript_20A042
-	case 4, SlateportCity_PokemonFanClub_EventScript_20A073
-	case 5, SlateportCity_PokemonFanClub_EventScript_20A0A4
+	case 0, SlateportCity_PokemonFanClub_EventScript_NoHighConditions
+	case 1, SlateportCity_PokemonFanClub_EventScript_GiveRedScarf
+	case 2, SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf
+	case 3, SlateportCity_PokemonFanClub_EventScript_GivePinkScarf
+	case 4, SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf
+	case 5, SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209FCA:: @ 8209FCA
+SlateportCity_PokemonFanClub_EventScript_ReceivedAllScarves:: @ 8209FCA
 	setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2
 	return
 
-SlateportCity_PokemonFanClub_EventScript_209FD0:: @ 8209FD0
+SlateportCity_PokemonFanClub_EventScript_CountReceivedScarf:: @ 8209FD0
 	addvar VAR_TEMP_2, 1
 	return
 
-SlateportCity_PokemonFanClub_EventScript_209FD6:: @ 8209FD6
-	msgbox SlateportCity_PokemonFanClub_Text_20A66E, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_NoHighConditions:: @ 8209FD6
+	msgbox SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0
+SlateportCity_PokemonFanClub_EventScript_GiveRedScarf:: @ 8209FE0
 	checkitemspace ITEM_RED_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_RED_SCARF
 	giveitem_std ITEM_RED_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A827, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainRedScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011
+SlateportCity_PokemonFanClub_EventScript_GiveBlueScarf:: @ 820A011
 	checkitemspace ITEM_BLUE_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_BLUE_SCARF
 	giveitem_std ITEM_BLUE_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A880, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainBlueScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042
+SlateportCity_PokemonFanClub_EventScript_GivePinkScarf:: @ 820A042
 	checkitemspace ITEM_PINK_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_PINK_SCARF
 	giveitem_std ITEM_PINK_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A8D7, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainPinkScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073
+SlateportCity_PokemonFanClub_EventScript_GiveGreenScarf:: @ 820A073
 	checkitemspace ITEM_GREEN_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_GREEN_SCARF
 	giveitem_std ITEM_GREEN_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A933, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainGreenScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4
+SlateportCity_PokemonFanClub_EventScript_GiveYellowScarf:: @ 820A0A4
 	checkitemspace ITEM_YELLOW_SCARF, 1
-	compare VAR_RESULT, 0
-	goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf
+	msgbox SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis, MSGBOX_DEFAULT
 	setflag FLAG_RECEIVED_YELLOW_SCARF
 	giveitem_std ITEM_YELLOW_SCARF
-	msgbox SlateportCity_PokemonFanClub_Text_20A984, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_ExplainYellowScarf, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A0D5:: @ 820A0D5
-	msgbox SlateportCity_PokemonFanClub_Text_20A719, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_NoRoomForScarf:: @ 820A0D5
+	msgbox SlateportCity_PokemonFanClub_Text_NoSpaceForReward, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A0DF:: @ 820A0DF
+SlateportCity_PokemonFanClub_EventScript_CheckMonCool:: @ 820A0DF
 	specialvar VAR_RESULT, CheckLeadMonCool
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A0F0
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCool
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A0F0:: @ 820A0F0
+SlateportCity_PokemonFanClub_EventScript_SetMonCool:: @ 820A0F0
 	setvar VAR_TEMP_1, 1
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A0F6:: @ 820A0F6
+SlateportCity_PokemonFanClub_EventScript_CheckMonBeauty:: @ 820A0F6
 	specialvar VAR_RESULT, CheckLeadMonBeauty
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A107
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonBeauty
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A107:: @ 820A107
+SlateportCity_PokemonFanClub_EventScript_SetMonBeauty:: @ 820A107
 	setvar VAR_TEMP_1, 2
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A10D:: @ 820A10D
+SlateportCity_PokemonFanClub_EventScript_CheckMonCute:: @ 820A10D
 	specialvar VAR_RESULT, CheckLeadMonCute
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A11E
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonCute
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A11E:: @ 820A11E
+SlateportCity_PokemonFanClub_EventScript_SetMonCute:: @ 820A11E
 	setvar VAR_TEMP_1, 3
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A124:: @ 820A124
+SlateportCity_PokemonFanClub_EventScript_CheckMonSmart:: @ 820A124
 	specialvar VAR_RESULT, CheckLeadMonSmart
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A135
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonSmart
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A135:: @ 820A135
+SlateportCity_PokemonFanClub_EventScript_SetMonSmart:: @ 820A135
 	setvar VAR_TEMP_1, 4
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A13B:: @ 820A13B
+SlateportCity_PokemonFanClub_EventScript_CheckMonTough:: @ 820A13B
 	specialvar VAR_RESULT, CheckLeadMonTough
-	compare VAR_RESULT, 1
-	call_if_eq SlateportCity_PokemonFanClub_EventScript_20A14C
+	compare VAR_RESULT, TRUE
+	call_if_eq SlateportCity_PokemonFanClub_EventScript_SetMonTough
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C
+SlateportCity_PokemonFanClub_EventScript_SetMonTough:: @ 820A14C
 	setvar VAR_TEMP_1, 5
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152
-	goto_if_set FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A168
-	msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_ChairmanNotEnteredContest:: @ 820A152
+	goto_if_set FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest
+	msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT
 	setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168
-	msgbox SlateportCity_PokemonFanClub_Text_20A3EE, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_ChairmanEnterContest:: @ 820A168
+	msgbox SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172
-	msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_MeetChairman:: @ 820A172
+	msgbox SlateportCity_PokemonFanClub_Text_MeetChairman, MSGBOX_DEFAULT
 	setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN
 	return
 
-SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E
+SlateportCity_PokemonFanClub_EventScript_SootheBellWoman:: @ 820A17E
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_20A1DE
-	msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell
+	msgbox SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GetLeadMonFriendshipScore
 	compare VAR_RESULT, 4
-	goto_if_ge SlateportCity_PokemonFanClub_EventScript_20A1A3
+	goto_if_ge SlateportCity_PokemonFanClub_EventScript_GiveSootheBell
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3
+SlateportCity_PokemonFanClub_EventScript_GiveSootheBell:: @ 820A1A3
 	playse SE_PIN
 	applymovement VAR_LAST_TALKED, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement VAR_LAST_TALKED, Common_Movement_Delay48
 	waitmovement 0
-	msgbox SlateportCity_PokemonFanClub_Text_20AB63, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_PokemonAdoresYou, MSGBOX_DEFAULT
 	giveitem_std ITEM_SOOTHE_BELL
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_SOOTHE_BELL
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1DE:: @ 820A1DE
-	msgbox SlateportCity_PokemonFanClub_Text_20ABC4, MSGBOX_DEFAULT
+SlateportCity_PokemonFanClub_EventScript_ReceivedSootheBell:: @ 820A1DE
+	msgbox SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove, MSGBOX_DEFAULT
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1E8:: @ 820A1E8
-	msgbox SlateportCity_PokemonFanClub_Text_20AC47, MSGBOX_NPC
+SlateportCity_PokemonFanClub_EventScript_Man:: @ 820A1E8
+	msgbox SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1F1:: @ 820A1F1
-	msgbox SlateportCity_PokemonFanClub_Text_20ACF9, MSGBOX_NPC
+SlateportCity_PokemonFanClub_EventScript_Twin:: @ 820A1F1
+	msgbox SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein, MSGBOX_NPC
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A1FA:: @ 820A1FA
+SlateportCity_PokemonFanClub_EventScript_Skitty:: @ 820A1FA
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_SKITTY, 0
-	msgbox SlateportCity_PokemonFanClub_Text_20AD5A, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_Skitty, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A20D:: @ 820A20D
+SlateportCity_PokemonFanClub_EventScript_Zigzagoon:: @ 820A20D
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_ZIGZAGOON, 0
-	msgbox SlateportCity_PokemonFanClub_Text_20AD6E, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_Zigzagoon, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_20A220:: @ 820A220
+SlateportCity_PokemonFanClub_EventScript_Azumarill:: @ 820A220
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_AZUMARILL, 0
-	msgbox SlateportCity_PokemonFanClub_Text_20AD80, MSGBOX_DEFAULT
+	msgbox SlateportCity_PokemonFanClub_Text_Azumarill, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SlateportCity_PokemonFanClub_Text_20A233: @ 820A233
+SlateportCity_PokemonFanClub_Text_MeetChairman: @ 820A233
 	.string "Er-hem! I am the CHAIRMAN of the\n"
 	.string "POKéMON FAN CLUB!\p"
 	.string "Being the CHAIRMAN, I am naturally\n"
@@ -283,12 +283,12 @@ SlateportCity_PokemonFanClub_Text_20A233: @ 820A233
 	.string "off our POKéMON, and have others\l"
 	.string "show us theirs.$"
 
-SlateportCity_PokemonFanClub_Text_20A3EE: @ 820A3EE
+SlateportCity_PokemonFanClub_Text_LikeToSeeEnteredContestPokemon: @ 820A3EE
 	.string "The POKéMON of a TRAINER who has\n"
 	.string "entered a POKéMON CONTEST…\l"
 	.string "That, I would like to see.$"
 
-SlateportCity_PokemonFanClub_Text_20A445: @ 820A445
+SlateportCity_PokemonFanClub_Text_AllowMeToExamineYourPokemon: @ 820A445
 	.string "Er-hem! I see you've participated in\n"
 	.string "a POKéMON CONTEST!\p"
 	.string "Please! Allow me to examine how you\n"
@@ -306,15 +306,15 @@ SlateportCity_PokemonFanClub_Text_20A445: @ 820A445
 	.string "Please! Allow me to examine how much\n"
 	.string "your POKéMON has grown!$"
 
-SlateportCity_PokemonFanClub_Text_20A62A: @ 820A62A
+SlateportCity_PokemonFanClub_Text_HowIsYourPokemonGrowing: @ 820A62A
 	.string "How is your POKéMON growing?\n"
 	.string "Allow me to examine it.$"
 
-SlateportCity_PokemonFanClub_Text_20A65F: @ 820A65F
+SlateportCity_PokemonFanClub_Text_HmHmISee: @ 820A65F
 	.string "Hm, hm…\n"
 	.string "I see…$"
 
-SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E
+SlateportCity_PokemonFanClub_Text_GiveMonMorePokeblocks: @ 820A66E
 	.string "Hmmm… It's not bad, but it's not\n"
 	.string "good, either…\p"
 	.string "You, the TRAINER, must put more\n"
@@ -322,53 +322,53 @@ SlateportCity_PokemonFanClub_Text_20A66E: @ 820A66E
 	.string "For instance, may I suggest that\n"
 	.string "you give it more {POKEBLOCK}S?$"
 
-SlateportCity_PokemonFanClub_Text_20A719: @ 820A719
+SlateportCity_PokemonFanClub_Text_NoSpaceForReward: @ 820A719
 	.string "Oh, my…\p"
 	.string "Your POKéMON is growing quite well,\n"
 	.string "so you deserve a reward.\p"
 	.string "Unfortunately, you have no space for\n"
 	.string "this in your BAG.$"
 
-SlateportCity_PokemonFanClub_Text_20A795: @ 820A795
+SlateportCity_PokemonFanClub_Text_MonMostImpressiveGiveItThis: @ 820A795
 	.string "Your {STR_VAR_1}, it is growing in\n"
 	.string "a most impressive manner!\l"
 	.string "It is one fine specimen!\p"
 	.string "But! If you were to give it this,\n"
 	.string "it would grow even better! Indeed!$"
 
-SlateportCity_PokemonFanClub_Text_20A827: @ 820A827
+SlateportCity_PokemonFanClub_Text_ExplainRedScarf: @ 820A827
 	.string "Let a POKéMON hold that RED SCARF.\p"
 	.string "Everyone will recognize the coolness\n"
 	.string "of that POKéMON!$"
 
-SlateportCity_PokemonFanClub_Text_20A880: @ 820A880
+SlateportCity_PokemonFanClub_Text_ExplainBlueScarf: @ 820A880
 	.string "Let a POKéMON hold that BLUE SCARF.\p"
 	.string "Its beauty will be accentuated much\n"
 	.string "more than now!$"
 
-SlateportCity_PokemonFanClub_Text_20A8D7: @ 820A8D7
+SlateportCity_PokemonFanClub_Text_ExplainPinkScarf: @ 820A8D7
 	.string "Let a POKéMON hold that PINK SCARF.\p"
 	.string "It will draw out the cuteness of\n"
 	.string "the POKéMON some more!$"
 
-SlateportCity_PokemonFanClub_Text_20A933: @ 820A933
+SlateportCity_PokemonFanClub_Text_ExplainGreenScarf: @ 820A933
 	.string "Let a POKéMON hold that GREEN SCARF.\p"
 	.string "That will enhance the\n"
 	.string "smartness of POKéMON!$"
 
-SlateportCity_PokemonFanClub_Text_20A984: @ 820A984
+SlateportCity_PokemonFanClub_Text_ExplainYellowScarf: @ 820A984
 	.string "Let a POKéMON hold that YELLOW SCARF.\p"
 	.string "It will bolster your POKéMON's\n"
 	.string "toughness so much more!$"
 
-SlateportCity_PokemonFanClub_Text_20A9E1: @ 820A9E1
+SlateportCity_PokemonFanClub_Text_NothingElseToGiveYou: @ 820A9E1
 	.string "I'm sorry, but I've nothing else to\n"
 	.string "give you! None at all!\p"
 	.string "After all, you're blessed with the gift\n"
 	.string "of raising POKéMON without resorting\l"
 	.string "to any items!$"
 
-SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77
+SlateportCity_PokemonFanClub_Text_ShowMePokemonThatLoveYou: @ 820AA77
 	.string "I love seeing POKéMON that love\n"
 	.string "their TRAINERS.\p"
 	.string "POKéMON are very sensitive to\n"
@@ -378,18 +378,18 @@ SlateportCity_PokemonFanClub_Text_20AA77: @ 820AA77
 	.string "When your POKéMON grow to love you,\n"
 	.string "please come show me.$"
 
-SlateportCity_PokemonFanClub_Text_20AB63: @ 820AB63
+SlateportCity_PokemonFanClub_Text_PokemonAdoresYou: @ 820AB63
 	.string "Your POKéMON really adores you.\p"
 	.string "For you, a most compassionate\n"
 	.string "TRAINER, a gift from the FAN CLUB!$"
 
-SlateportCity_PokemonFanClub_Text_20ABC4: @ 820ABC4
+SlateportCity_PokemonFanClub_Text_TreatPokemonWithLove: @ 820ABC4
 	.string "POKéMON are very sensitive to\n"
 	.string "the feelings of their TRAINERS.\p"
 	.string "If you treat your POKéMON with love\n"
 	.string "and care, they'll love you back.$"
 
-SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47
+SlateportCity_PokemonFanClub_Text_PokemonDontLikeFainting: @ 820AC47
 	.string "If you keep letting a POKéMON faint\n"
 	.string "in battle, it'll come to resent it.\p"
 	.string "Soon, it will become less trusting\n"
@@ -397,18 +397,18 @@ SlateportCity_PokemonFanClub_Text_20AC47: @ 820AC47
 	.string "In other words, it certainly won't\n"
 	.string "like you very much.$"
 
-SlateportCity_PokemonFanClub_Text_20ACF9: @ 820ACF9
+SlateportCity_PokemonFanClub_Text_MonEnjoyedProtein: @ 820ACF9
 	.string "Do POKéMON enjoy having items used\n"
 	.string "on them?\p"
 	.string "Mine acted really happy when I gave\n"
 	.string "it some PROTEIN.$"
 
-SlateportCity_PokemonFanClub_Text_20AD5A: @ 820AD5A
+SlateportCity_PokemonFanClub_Text_Skitty: @ 820AD5A
 	.string "SKITTY: Fffnyaaaah…$"
 
-SlateportCity_PokemonFanClub_Text_20AD6E: @ 820AD6E
+SlateportCity_PokemonFanClub_Text_Zigzagoon: @ 820AD6E
 	.string "ZIGZAGOON: Kyuuu…$"
 
-SlateportCity_PokemonFanClub_Text_20AD80: @ 820AD80
+SlateportCity_PokemonFanClub_Text_Azumarill: @ 820AD80
 	.string "AZUMARILL: Marimari?$"
 
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/map.json b/data/maps/SlateportCity_SternsShipyard_1F/map.json
index 351431280..d5d8fce4e 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/map.json
+++ b/data/maps/SlateportCity_SternsShipyard_1F/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_1F_EventScript_207F40",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_Dock",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FED",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_Scientist1",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FF6",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_Scientist2",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_1F_EventScript_207FFF",
+      "script": "SlateportCity_SternsShipyard_1F_EventScript_Briney",
       "flag": "FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY"
     }
   ],
diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
index 6c554387a..4939f5407 100644
--- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc
@@ -1,16 +1,16 @@
 SlateportCity_SternsShipyard_1F_MapScripts:: @ 8207F3F
 	.byte 0
 
-SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40
+SlateportCity_SternsShipyard_1F_EventScript_Dock:: @ 8207F40
 	lockall
-	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_207F92
-	goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_207FA6
-	goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9
-	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA
-	msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT
+	goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_FerryReady
+	goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined
+	goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran
+	goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_GoFindStern
+	msgbox SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_2080A5, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
@@ -19,50 +19,50 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207F92:: @ 8207F92
+SlateportCity_SternsShipyard_1F_EventScript_FerryReady:: @ 8207F92
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_208323, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_FerryIsReady, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FA6:: @ 8207FA6
+SlateportCity_SternsShipyard_1F_EventScript_BrineyJoined:: @ 8207FA6
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_2082A8, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FBA:: @ 8207FBA
+SlateportCity_SternsShipyard_1F_EventScript_GoFindStern:: @ 8207FBA
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_2081A5, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FaceOriginalDirection
 	waitmovement 0
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FD9:: @ 8207FD9
+SlateportCity_SternsShipyard_1F_EventScript_NeedVeteran:: @ 8207FD9
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox SlateportCity_SternsShipyard_1F_Text_208213, MSGBOX_DEFAULT
+	msgbox SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FED:: @ 8207FED
-	msgbox SlateportCity_SternsShipyard_1F_Text_208558, MSGBOX_NPC
+SlateportCity_SternsShipyard_1F_EventScript_Scientist1:: @ 8207FED
+	msgbox SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FF6:: @ 8207FF6
-	msgbox SlateportCity_SternsShipyard_1F_Text_2085FF, MSGBOX_NPC
+SlateportCity_SternsShipyard_1F_EventScript_Scientist2:: @ 8207FF6
+	msgbox SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_EventScript_207FFF:: @ 8207FFF
-	msgbox SlateportCity_SternsShipyard_1F_Text_2083EE, MSGBOX_NPC
+SlateportCity_SternsShipyard_1F_EventScript_Briney:: @ 8207FFF
+	msgbox SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008
+SlateportCity_SternsShipyard_1F_Text_CantMakeHeadsOrTails: @ 8208008
 	.string "Umm… If this goes here, and that\n"
 	.string "goes over there…\p"
 	.string "Then where does this thing go?\n"
@@ -70,7 +70,7 @@ SlateportCity_SternsShipyard_1F_Text_208008: @ 8208008
 	.string "Aaargh! I can't make heads or tails\n"
 	.string "of this!$"
 
-SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5
+SlateportCity_SternsShipyard_1F_Text_MeetDockDeliverToStern: @ 82080A5
 	.string "Hm?\n"
 	.string "Hi, I'm DOCK.\p"
 	.string "CAPT. STERN commissioned me to\n"
@@ -84,26 +84,26 @@ SlateportCity_SternsShipyard_1F_Text_2080A5: @ 82080A5
 	.string "Could I get you to go find CAPT.\n"
 	.string "STERN and deliver that to him?$"
 
-SlateportCity_SternsShipyard_1F_Text_2081A5: @ 82081A5
+SlateportCity_SternsShipyard_1F_Text_CouldYouFindStern: @ 82081A5
 	.string "DOCK: Where could CAPT. STERN have\n"
 	.string "gone off to?\p"
 	.string "Could you go find CAPT. STERN and\n"
 	.string "deliver that parcel to him?$"
 
-SlateportCity_SternsShipyard_1F_Text_208213: @ 8208213
+SlateportCity_SternsShipyard_1F_Text_CouldUseAdviceFromVeteran: @ 8208213
 	.string "DOCK: Shipbuilding is an art.\p"
 	.string "A lot of things can't be figured out\n"
 	.string "just by calculating.\p"
 	.string "I really could use advice from a veteran\n"
 	.string "who knows the seas…$"
 
-SlateportCity_SternsShipyard_1F_Text_2082A8: @ 82082A8
+SlateportCity_SternsShipyard_1F_Text_BrineyJoinedUs: @ 82082A8
 	.string "DOCK: Hi! MR. BRINEY's joined us to\n"
 	.string "lend us his help.\p"
 	.string "Thanks to the veteran sailor, the\n"
 	.string "ferry is steadily coming together.$"
 
-SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323
+SlateportCity_SternsShipyard_1F_Text_FerryIsReady: @ 8208323
 	.string "DOCK: The ferry is finally ready!\p"
 	.string "The new S.S. TIDAL is truly a marvel\n"
 	.string "of technology!\p"
@@ -112,7 +112,7 @@ SlateportCity_SternsShipyard_1F_Text_208323: @ 8208323
 	.string "You know, there's never an end to\n"
 	.string "technology's march.$"
 
-SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE
+SlateportCity_SternsShipyard_1F_Text_DecidedToHelpDock: @ 82083EE
 	.string "MR. BRINEY: Ah, {PLAYER}{KUN}!\n"
 	.string "It's been too long!\p"
 	.string "Aye, since I met you, this old sea dog's\n"
@@ -127,7 +127,7 @@ SlateportCity_SternsShipyard_1F_Text_2083EE: @ 82083EE
 	.string "my experience, I'm sure that we can\l"
 	.string "build one great ship, aye!$"
 
-SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558
+SlateportCity_SternsShipyard_1F_Text_SeaIsLikeLivingThing: @ 8208558
 	.string "The seasons, the weather, where\n"
 	.string "the moon sits in the sky…\p"
 	.string "These and other conditions make\n"
@@ -135,7 +135,7 @@ SlateportCity_SternsShipyard_1F_Text_208558: @ 8208558
 	.string "That's right!\n"
 	.string "The sea is like a living thing!$"
 
-SlateportCity_SternsShipyard_1F_Text_2085FF: @ 82085FF
+SlateportCity_SternsShipyard_1F_Text_GetSeasickEasily: @ 82085FF
 	.string "I get seasick real easily.\n"
 	.string "So I get to help out here instead.$"
 
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/map.json b/data/maps/SlateportCity_SternsShipyard_2F/map.json
index 2e57c63fd..78b39989f 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/map.json
+++ b/data/maps/SlateportCity_SternsShipyard_2F/map.json
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_2F_EventScript_20863E",
+      "script": "SlateportCity_SternsShipyard_2F_EventScript_Scientist1",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SlateportCity_SternsShipyard_2F_EventScript_208647",
+      "script": "SlateportCity_SternsShipyard_2F_EventScript_Scientist2",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
index 6fa410dfe..fff96bc65 100644
--- a/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
+++ b/data/maps/SlateportCity_SternsShipyard_2F/scripts.inc
@@ -1,20 +1,20 @@
 SlateportCity_SternsShipyard_2F_MapScripts:: @ 820863D
 	.byte 0
 
-SlateportCity_SternsShipyard_2F_EventScript_20863E:: @ 820863E
-	msgbox SlateportCity_SternsShipyard_2F_Text_208650, MSGBOX_NPC
+SlateportCity_SternsShipyard_2F_EventScript_Scientist1:: @ 820863E
+	msgbox SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_2F_EventScript_208647:: @ 8208647
-	msgbox SlateportCity_SternsShipyard_2F_Text_2086BA, MSGBOX_NPC
+SlateportCity_SternsShipyard_2F_EventScript_Scientist2:: @ 8208647
+	msgbox SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy, MSGBOX_NPC
 	end
 
-SlateportCity_SternsShipyard_2F_Text_208650: @ 8208650
+SlateportCity_SternsShipyard_2F_Text_ShipDesignMoreLikeBuilding: @ 8208650
 	.string "Designing a large ship is more like\n"
 	.string "making a big building than putting\l"
 	.string "together a transportation vehicle.$"
 
-SlateportCity_SternsShipyard_2F_Text_2086BA: @ 82086BA
+SlateportCity_SternsShipyard_2F_Text_FloatsBecauseBuoyancy: @ 82086BA
 	.string "Don't you think it's strange that\n"
 	.string "a ship made of heavy iron floats?\p"
 	.string "It floats because of a principle\n"
diff --git a/data/maps/map_groups.json b/data/maps/map_groups.json
index 74746e0c4..190e41fc8 100644
--- a/data/maps/map_groups.json
+++ b/data/maps/map_groups.json
@@ -170,12 +170,12 @@
     "SlateportCity_BattleTentLobby",
     "SlateportCity_BattleTentCorridor",
     "SlateportCity_BattleTentBattleRoom",
-    "SlateportCity_House1",
+    "SlateportCity_NameRatersHouse",
     "SlateportCity_PokemonFanClub",
     "SlateportCity_OceanicMuseum_1F",
     "SlateportCity_OceanicMuseum_2F",
     "SlateportCity_Harbor",
-    "SlateportCity_House2",
+    "SlateportCity_House",
     "SlateportCity_PokemonCenter_1F",
     "SlateportCity_PokemonCenter_2F",
     "SlateportCity_Mart"
diff --git a/data/scripts/interview.inc b/data/scripts/interview.inc
index 8b2b72f75..5036e8ec9 100644
--- a/data/scripts/interview.inc
+++ b/data/scripts/interview.inc
@@ -105,7 +105,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C939:: @ 828C939
 	release
 	end
 
-SlateportCity_PokemonFanClub_EventScript_28C943:: @ 828C943
+SlateportCity_PokemonFanClub_EventScript_Reporter:: @ 828C943
 	lock
 	faceplayer
 	specialvar VAR_RESULT, sub_80EF8F8
diff --git a/data/specials.inc b/data/specials.inc
index 9954ba9dc..cfc50e49c 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -134,9 +134,9 @@ gSpecials:: @ 81DBA64
 	def_special CompareSeedotSize
 	def_special GetLotadSizeRecordInfo
 	def_special CompareLotadSize
-	def_special TV_PutNameRaterShowOnTheAirIfNicknameChanged
-	def_special TV_CopyNicknameToStringVar1AndEnsureTerminated
-	def_special TV_CheckMonOTIDEqualsPlayerID
+	def_special TryPutNameRaterShowOnTheAir
+	def_special BufferMonNickname
+	def_special IsMonOTIDNotPlayers
 	def_special BufferTrendyPhraseString
 	def_special TrendyPhraseIsOld
 	def_special sub_811EF6C
@@ -346,7 +346,7 @@ gSpecials:: @ 81DBA64
 	def_special SetPacifidlogTMReceivedDay
 	def_special GetDaysUntilPacifidlogTMAvailable
 	def_special HasAllHoennMons
-	def_special MonOTNameMatchesPlayer
+	def_special MonOTNameNotPlayer
 	def_special BufferLottoTicketNumber
 	def_special sub_81653CC
 	def_special DoesPartyHaveEnigmaBerry
@@ -519,7 +519,7 @@ gSpecials:: @ 81DBA64
 	def_special Script_DoRayquazaScene @ Listed twice
 	def_special LoopWingFlapSE
 	def_special sub_81D4BEC
-	def_special sub_80224D0
+	def_special ShowBerryCrushRankings
 	def_special TryBufferWaldaPhrase
 	def_special DoWaldaNamingScreen
 	def_special TryGetWallpaperWithWaldaPhrase
diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h
index 63717c92c..be8f2fec8 100755
--- a/include/constants/map_groups.h
+++ b/include/constants/map_groups.h
@@ -136,12 +136,12 @@
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_LOBBY       (2 | (9 << 8))
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_CORRIDOR    (3 | (9 << 8))
 #define MAP_SLATEPORT_CITY_BATTLE_TENT_BATTLE_ROOM (4 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE1                  (5 | (9 << 8))
+#define MAP_SLATEPORT_CITY_NAME_RATERS_HOUSE       (5 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_FAN_CLUB        (6 | (9 << 8))
 #define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_1F       (7 | (9 << 8))
 #define MAP_SLATEPORT_CITY_OCEANIC_MUSEUM_2F       (8 | (9 << 8))
 #define MAP_SLATEPORT_CITY_HARBOR                  (9 | (9 << 8))
-#define MAP_SLATEPORT_CITY_HOUSE2                  (10 | (9 << 8))
+#define MAP_SLATEPORT_CITY_HOUSE                   (10 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_CENTER_1F       (11 | (9 << 8))
 #define MAP_SLATEPORT_CITY_POKEMON_CENTER_2F       (12 | (9 << 8))
 #define MAP_SLATEPORT_CITY_MART                    (13 | (9 << 8))
diff --git a/src/field_specials.c b/src/field_specials.c
index 94c187eaa..109d57fd1 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -1609,18 +1609,16 @@ u16 SetPacifidlogTMReceivedDay(void)
     return gLocalTime.days;
 }
 
-bool8 MonOTNameMatchesPlayer(void)
+bool8 MonOTNameNotPlayer(void)
 {
     if (GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_LANGUAGE) != GAME_LANGUAGE)
-    {
-        return TRUE;    // huh?
-    }
+        return TRUE;
 
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_NAME, gStringVar1);
+
     if (!StringCompare(gSaveBlock2Ptr->playerName, gStringVar1))
-    {
         return FALSE;
-    }
+
     return TRUE;
 }
 
diff --git a/src/tv.c b/src/tv.c
index 4cb6df16f..cb44fdb62 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -3436,13 +3436,14 @@ bool8 TV_IsScriptShowKindAlreadyInQueue(void)
     return FALSE;
 }
 
-bool8 TV_PutNameRaterShowOnTheAirIfNicknameChanged(void)
+bool8 TryPutNameRaterShowOnTheAir(void)
 {
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
+
+    // Nickname wasnt changed
     if (!StringCompare(gStringVar3, gStringVar1))
-    {
         return FALSE;
-    }
+
     PutNameRaterShowOnTheAir();
     return TRUE;
 }
@@ -3478,22 +3479,18 @@ void ChangeBoxPokemonNickname_CB(void)
     CB2_ReturnToFieldContinueScriptPlayMapMusic();
 }
 
-void TV_CopyNicknameToStringVar1AndEnsureTerminated(void)
+void BufferMonNickname(void)
 {
     GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar1);
     StringGetEnd10(gStringVar1);
 }
 
-void TV_CheckMonOTIDEqualsPlayerID(void)
+void IsMonOTIDNotPlayers(void)
 {
     if (GetPlayerIDAsU32() == GetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_OT_ID, NULL))
-    {
         gSpecialVar_Result = FALSE;
-    }
     else
-    {
         gSpecialVar_Result = TRUE;
-    }
 }
 
 u8 GetTVChannelByShowType(u8 kind)