Document SS Tidal scripts

9 files changed, 218 insertions, 220 deletions

diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc
index 3d087c914..cf273bcb8 100644
--- a/data/maps/LilycoveCity_Harbor/scripts.inc
+++ b/data/maps/LilycoveCity_Harbor/scripts.inc
@@ -89,7 +89,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateport:: @ 821E149
 	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
-	setvar VAR_PORTHOLE_STATE, 5
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
@@ -392,7 +392,7 @@ LilycoveCity_Harbor_EventScript_GoToSlateportUnused:: @ 821E575
 	msgbox LilycoveCity_Harbor_Text_SlateportItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq LilycoveCity_Harbor_EventScript_FerryDestinationChangeMind
-	setvar VAR_PORTHOLE_STATE, 5
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE
 	call LilycoveCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
diff --git a/data/maps/SSTidalCorridor/map.json b/data/maps/SSTidalCorridor/map.json
index ce6c3d2d0..3cf4b2cd0 100644
--- a/data/maps/SSTidalCorridor/map.json
+++ b/data/maps/SSTidalCorridor/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C119",
+      "script": "SSTidalCorridor_EventScript_ExitSailor",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 2,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C1A3",
+      "script": "SSTidalCorridor_EventScript_Sailor",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C0D9",
+      "script": "SSTidalCorridor_EventScript_Briney",
       "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalCorridor_EventScript_23C0E2",
+      "script": "SSTidalCorridor_EventScript_Peeko",
       "flag": "FLAG_HIDE_SS_TIDAL_CORRIDOR_MR_BRINEY"
     },
     {
@@ -153,7 +153,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -161,7 +161,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -169,7 +169,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -177,7 +177,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -185,7 +185,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -193,7 +193,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -201,7 +201,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -209,7 +209,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalCorridor_EventScript_23C17D"
+      "script": "SSTidalCorridor_EventScript_Porthole"
     },
     {
       "type": "sign",
@@ -217,7 +217,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C0F5"
+      "script": "SSTidalCorridor_EventScript_Cabin1Sign"
     },
     {
       "type": "sign",
@@ -225,7 +225,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C0FE"
+      "script": "SSTidalCorridor_EventScript_Cabin2Sign"
     },
     {
       "type": "sign",
@@ -233,7 +233,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C107"
+      "script": "SSTidalCorridor_EventScript_Cabin3Sign"
     },
     {
       "type": "sign",
@@ -241,7 +241,7 @@
       "y": 9,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "SSTidalCorridor_EventScript_23C110"
+      "script": "SSTidalCorridor_EventScript_Cabin4Sign"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index f91cc6a3b..6b88b7ae1 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -1,218 +1,218 @@
 SSTidalCorridor_MapScripts:: @ 823BFCF
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_MapScript2_23BFD5
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, SSTidalCorridor_OnFrame
 	.byte 0
 
-SSTidalCorridor_MapScript2_23BFD5: @ 823BFD5
-	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_23C219
-	map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_23BFFF
-	map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_23C015
-	map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_23C067
-	map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_23C07D
+SSTidalCorridor_OnFrame: @ 823BFD5
+	map_script_2 VAR_SS_TIDAL_SCOTT_STATE, 0, SSTidalCorridor_EventScript_ScottScene
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT, SSTidalCorridor_EventScript_DepartSlateportForLilycove
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_LILYCOVE, SSTidalCorridor_EventScript_DepartLilycoveForSlateport
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_RIGHT, SSTidalCorridor_EventScript_HalfwayToLilycove
+	map_script_2 VAR_SS_TIDAL_STATE, SS_TIDAL_EXIT_CURRENTS_LEFT, SSTidalCorridor_EventScript_ArrivedInSlateport
 	.2byte 0
 
-SSTidalCorridor_EventScript_23BFFF:: @ 823BFFF
+SSTidalCorridor_EventScript_DepartSlateportForLilycove:: @ 823BFFF
 	special SetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 2
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C462, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C015:: @ 823C015
-	setvar VAR_PORTHOLE_STATE, 6
+SSTidalCorridor_EventScript_DepartLilycoveForSlateport:: @ 823C015
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_LILYCOVE
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23C028:: @ 823C028
+SSTidalRooms_EventScript_HalfwayToSlateport:: @ 823C028
 	special SetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 7
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C462, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_23C03C:: @ 823C03C
+SSTidalRooms_EventScript_ArrivedInLilycove:: @ 823C03C
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 4
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C553, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInLilycove, MSGBOX_DEFAULT
 	return
 
-SSTidalCorridor_EventScript_23C050:: @ 823C050
-	compare VAR_PORTHOLE_STATE, 2
-	goto_if_eq SSTidalCorridor_EventScript_23C067
-	compare VAR_PORTHOLE_STATE, 7
-	goto_if_eq SSTidalCorridor_EventScript_23C07D
+SSTidalCorridor_EventScript_ReachedStepCount:: @ 823C050
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_HalfwayToLilycove
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_ArrivedInSlateport
 	end
 
-SSTidalCorridor_EventScript_23C067:: @ 823C067
+SSTidalCorridor_EventScript_HalfwayToLilycove:: @ 823C067
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 3
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_LILYCOVE
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C4E3, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_HopeYouEnjoyVoyage, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C07D:: @ 823C07D
+SSTidalCorridor_EventScript_ArrivedInSlateport:: @ 823C07D
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 8
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	lockall
 	playse SE_PINPON
-	msgbox SSTidalCorridor_Text_23C50F, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23C093:: @ 823C093
+SSTidalRooms_EventScript_ArrivedInSlateport:: @ 823C093
 	special ResetSSTidalFlag
-	setvar VAR_PORTHOLE_STATE, 8
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
 	playse SE_PINPON
-	msgbox SSTidalRooms_Text_23C50F, MSGBOX_DEFAULT
+	msgbox SSTidal_Text_MadeLandInSlateport, MSGBOX_DEFAULT
 	return
 
-SSTidalRooms_EventScript_23C0A7:: @ 823C0A7
-	switch VAR_PORTHOLE_STATE
-	case 2, SSTidalRooms_EventScript_23C03C
-	case 3, SSTidalRooms_EventScript_23C03C
-	case 6, SSTidalRooms_EventScript_23C028
-	case 7, SSTidalRooms_EventScript_23C093
+SSTidalRooms_EventScript_ProgessCruiseAfterBed:: @ 823C0A7
+	switch VAR_SS_TIDAL_STATE
+	case SS_TIDAL_DEPART_SLATEPORT, SSTidalRooms_EventScript_ArrivedInLilycove
+	case SS_TIDAL_HALFWAY_LILYCOVE, SSTidalRooms_EventScript_ArrivedInLilycove
+	case SS_TIDAL_DEPART_LILYCOVE, SSTidalRooms_EventScript_HalfwayToSlateport
+	case SS_TIDAL_HALFWAY_SLATEPORT, SSTidalRooms_EventScript_ArrivedInSlateport
 	return
 
-SSTidalCorridor_EventScript_23C0D9:: @ 823C0D9
-	msgbox SSTidalCorridor_Text_23C6EC, MSGBOX_NPC
+SSTidalCorridor_EventScript_Briney:: @ 823C0D9
+	msgbox SSTidalCorridor_Text_BrineyWelcomeAboard, MSGBOX_NPC
 	end
 
-SSTidalCorridor_EventScript_23C0E2:: @ 823C0E2
+SSTidalCorridor_EventScript_Peeko:: @ 823C0E2
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_WINGULL, 0
-	msgbox SSTidalCorridor_Text_23C7E1, MSGBOX_DEFAULT
+	msgbox SSTidalCorridor_Text_Peeko, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-SSTidalCorridor_EventScript_23C0F5:: @ 823C0F5
-	msgbox SSTidalCorridor_Text_23C7F8, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin1Sign:: @ 823C0F5
+	msgbox SSTidalCorridor_Text_Cabin1, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C0FE:: @ 823C0FE
-	msgbox SSTidalCorridor_Text_23C800, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin2Sign:: @ 823C0FE
+	msgbox SSTidalCorridor_Text_Cabin2, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C107:: @ 823C107
-	msgbox SSTidalCorridor_Text_23C808, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin3Sign:: @ 823C107
+	msgbox SSTidalCorridor_Text_Cabin3, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C110:: @ 823C110
-	msgbox SSTidalCorridor_Text_23C810, MSGBOX_SIGN
+SSTidalCorridor_EventScript_Cabin4Sign:: @ 823C110
+	msgbox SSTidalCorridor_Text_Cabin4, MSGBOX_SIGN
 	end
 
-SSTidalCorridor_EventScript_23C119:: @ 823C119
+SSTidalCorridor_EventScript_ExitSailor:: @ 823C119
 	lock
 	faceplayer
-	compare VAR_PORTHOLE_STATE, 4
-	goto_if_eq SSTidalCorridor_EventScript_23C13B
-	compare VAR_PORTHOLE_STATE, 8
-	goto_if_eq SSTidalCorridor_EventScript_23C15A
-	msgbox SSTidalCorridor_Text_23C596, MSGBOX_DEFAULT
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_LILYCOVE
+	goto_if_eq SSTidalCorridor_EventScript_ExitLilycove
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_LAND_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_ExitSlateport
+	msgbox SSTidalCorridor_Text_CanRestInCabin2, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C13B:: @ 823C13B
+SSTidalCorridor_EventScript_ExitLilycove:: @ 823C13B
 	setrespawn HEAL_LOCATION_LILYCOVE_CITY
-	msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT
-	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179
+	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-SSTidalCorridor_EventScript_23C15A:: @ 823C15A
+SSTidalCorridor_EventScript_ExitSlateport:: @ 823C15A
 	setrespawn HEAL_LOCATION_SLATEPORT_CITY
-	msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT
-	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179
+	msgbox SSTidalCorridor_Text_WeveArrived, MSGBOX_DEFAULT
+	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_HideSnatchGiver
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
 	waitstate
 	release
 	end
 
-SSTidalCorridor_EventScript_23C179:: @ 823C179
+SSTidalCorridor_EventScript_HideSnatchGiver:: @ 823C179
 	setflag FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER
 	return
 
-SSTidalCorridor_EventScript_23C17D:: @ 823C17D
+SSTidalCorridor_EventScript_Porthole:: @ 823C17D
 	lockall
-	compare VAR_PORTHOLE_STATE, 2
-	goto_if_eq SSTidalCorridor_EventScript_23C19E
-	compare VAR_PORTHOLE_STATE, 7
-	goto_if_eq SSTidalCorridor_EventScript_23C19E
-	msgbox SSTidalCorridor_Text_23C6C3, MSGBOX_DEFAULT
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_DEPART_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
+	compare VAR_SS_TIDAL_STATE, SS_TIDAL_HALFWAY_SLATEPORT
+	goto_if_eq SSTidalCorridor_EventScript_LookThroughPorthole
+	msgbox SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole, MSGBOX_DEFAULT
 	releaseall
 	end
 
-SSTidalCorridor_EventScript_23C19E:: @ 823C19E
-	special sub_80FB7A4
+SSTidalCorridor_EventScript_LookThroughPorthole:: @ 823C19E
+	special LookThroughPorthole
 	waitstate
 	end
 
-SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3
+SSTidalCorridor_EventScript_Sailor:: @ 823C1A3
 	lock
 	faceplayer
-	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_23C1BD
-	call SSTidalCorridor_EventScript_23C1C7
-	msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT
+	goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_EnjoyYourCruise
+	call SSTidalCorridor_EventScript_CheckIfTrainersDefeated
+	msgbox SSTidalCorridor_Text_VisitOtherCabins, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C1BD:: @ 823C1BD
-	msgbox SSTidalCorridor_Text_23C6B0, MSGBOX_DEFAULT
+SSTidalCorridor_EventScript_EnjoyYourCruise:: @ 823C1BD
+	msgbox SSTidalCorridor_Text_EnjoyYourCruise, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7
+SSTidalCorridor_EventScript_CheckIfTrainersDefeated:: @ 823C1C7
 	checktrainerflag TRAINER_PHILLIP
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_LEONARD
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_COLTON
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_MICAH
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_THOMAS
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_LEA_AND_JED
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_GARRET
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	checktrainerflag TRAINER_NAOMI
-	goto_if_lt SSTidalCorridor_EventScript_23C218
+	goto_if_lt SSTidalCorridor_EventScript_TrainerNotDefeated
 	setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS
-	goto SSTidalCorridor_EventScript_23C1BD
+	goto SSTidalCorridor_EventScript_EnjoyYourCruise
 	return
 
-SSTidalCorridor_EventScript_23C218:: @ 823C218
+SSTidalCorridor_EventScript_TrainerNotDefeated:: @ 823C218
 	return
 
-SSTidalCorridor_EventScript_23C219:: @ 823C219
+SSTidalCorridor_EventScript_ScottScene:: @ 823C219
 	lockall
-	applymovement 5, SSTidalCorridor_Movement_23C26D
+	applymovement 5, SSTidalCorridor_Movement_ScottApproachPlayer
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox SSTidalCorridor_Text_23C28F, MSGBOX_DEFAULT
+	msgbox SSTidalCorridor_Text_ScottBattleFrontierInvite, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_23C27D
-	applymovement 1, SSTidalCorridor_Movement_23C284
-	applymovement 5, SSTidalCorridor_Movement_23C275
+	applymovement EVENT_OBJ_ID_PLAYER, SSTidalCorridor_Movement_PlayerWatchScottExit
+	applymovement 1, SSTidalCorridor_Movement_SailorMoveForScott
+	applymovement 5, SSTidalCorridor_Movement_ScottExit
 	waitmovement 0
 	playse SE_KAIDAN
 	waitse
 	removeobject 5
-	applymovement 1, SSTidalCorridor_Movement_23C28B
+	applymovement 1, SSTidalCorridor_Movement_SailorReturn
 	waitmovement 0
 	delay 30
 	setflag FLAG_MET_SCOTT_ON_SS_TIDAL
@@ -220,7 +220,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219
 	releaseall
 	end
 
-SSTidalCorridor_Movement_23C26D: @ 823C26D
+SSTidalCorridor_Movement_ScottApproachPlayer: @ 823C26D
 	walk_left
 	walk_left
 	walk_left
@@ -230,7 +230,7 @@ SSTidalCorridor_Movement_23C26D: @ 823C26D
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_23C275: @ 823C275
+SSTidalCorridor_Movement_ScottExit: @ 823C275
 	walk_in_place_fastest_down
 	delay_16
 	delay_16
@@ -240,7 +240,7 @@ SSTidalCorridor_Movement_23C275: @ 823C275
 	walk_left
 	step_end
 
-SSTidalCorridor_Movement_23C27D: @ 823C27D
+SSTidalCorridor_Movement_PlayerWatchScottExit: @ 823C27D
 	delay_16
 	delay_16
 	delay_16
@@ -249,7 +249,7 @@ SSTidalCorridor_Movement_23C27D: @ 823C27D
 	walk_in_place_fastest_down
 	step_end
 
-SSTidalCorridor_Movement_23C284: @ 823C284
+SSTidalCorridor_Movement_SailorMoveForScott: @ 823C284
 	delay_16
 	walk_right
 	walk_right
@@ -258,13 +258,13 @@ SSTidalCorridor_Movement_23C284: @ 823C284
 	walk_in_place_fastest_left
 	step_end
 
-SSTidalCorridor_Movement_23C28B: @ 823C28B
+SSTidalCorridor_Movement_SailorReturn: @ 823C28B
 	walk_left
 	walk_left
 	walk_in_place_fastest_up
 	step_end
 
-SSTidalCorridor_Text_23C28F: @ 823C28F
+SSTidalCorridor_Text_ScottBattleFrontierInvite: @ 823C28F
 	.string "SCOTT: Well, hi, hi!\n"
 	.string "{PLAYER}{KUN}, {PLAYER}{KUN}!\p"
 	.string "Something's come up, so I have to\n"
@@ -284,27 +284,25 @@ SSTidalCorridor_Text_23C28F: @ 823C28F
 	.string "Okay, {PLAYER}{KUN}, I'll be waiting for you\n"
 	.string "at the BATTLE FRONTIER!$"
 
-SSTidalCorridor_Text_23C462: @ 823C462
-SSTidalRooms_Text_23C462: @ 823C462
+SSTidal_Text_FastCurrentsHopeYouEnjoyVoyage: @ 823C462
 	.string "This ferry is built to plow through\n"
 	.string "fast-running currents.\p"
 	.string "We hope you enjoy your voyage with us.\n"
 	.string "Feel free to explore the ship.$"
 
-SSTidalCorridor_Text_23C4E3: @ 823C4E3
+SSTidal_Text_HopeYouEnjoyVoyage: @ 823C4E3
 	.string "We hope you enjoy your voyage on\n"
 	.string "our ferry.$"
 
-SSTidalCorridor_Text_23C50F: @ 823C50F
-SSTidalRooms_Text_23C50F: @ 823C50F
+SSTidal_Text_MadeLandInSlateport: @ 823C50F
 	.string "We have made land in SLATEPORT CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidalRooms_Text_23C553: @ 823C553
+SSTidal_Text_MadeLandInLilycove: @ 823C553
 	.string "We have made land in LILYCOVE CITY.\n"
 	.string "Thank you for sailing with us.$"
 
-SSTidalCorridor_Text_23C596: @ 823C596
+SSTidalCorridor_Text_CanRestInCabin2: @ 823C596
 	.string "It'll be some time before we make land,\n"
 	.string "I reckon.\p"
 	.string "You can rest up in your cabin if you'd\n"
@@ -312,22 +310,22 @@ SSTidalCorridor_Text_23C596: @ 823C596
 	.string "The bed in there is soft and plushy.\n"
 	.string "I can attest to how comfy it is!$"
 
-SSTidalCorridor_Text_23C64F: @ 823C64F
+SSTidalCorridor_Text_WeveArrived: @ 823C64F
 	.string "We've arrived!$"
 
-SSTidalCorridor_Text_23C65E: @ 823C65E
+SSTidalCorridor_Text_VisitOtherCabins: @ 823C65E
 	.string "Go visit other cabins.\n"
 	.string "TRAINERS bored of the boat trip will\l"
 	.string "be itching to battle.$"
 
-SSTidalCorridor_Text_23C6B0: @ 823C6B0
+SSTidalCorridor_Text_EnjoyYourCruise: @ 823C6B0
 	.string "Enjoy your cruise!$"
 
-SSTidalCorridor_Text_23C6C3: @ 823C6C3
+SSTidalCorridor_Text_HorizonSpreadsBeyondPorthole: @ 823C6C3
 	.string "The horizon spreads beyond\n"
 	.string "the porthole.$"
 
-SSTidalCorridor_Text_23C6EC: @ 823C6EC
+SSTidalCorridor_Text_BrineyWelcomeAboard: @ 823C6EC
 	.string "MR. BRINEY: Welcome aboard, {PLAYER}{KUN}!\p"
 	.string "They made me honorary captain of\n"
 	.string "the S.S. TIDAL!\p"
@@ -337,17 +335,17 @@ SSTidalCorridor_Text_23C6EC: @ 823C6EC
 	.string "Let me just say, it stirred my sleeping\n"
 	.string "soul as a sailor!$"
 
-SSTidalCorridor_Text_23C7E1: @ 823C7E1
+SSTidalCorridor_Text_Peeko: @ 823C7E1
 	.string "PEEKO: Pihyo pihyohyo…$"
 
-SSTidalCorridor_Text_23C7F8: @ 823C7F8
+SSTidalCorridor_Text_Cabin1: @ 823C7F8
 	.string "Cabin 1$"
 
-SSTidalCorridor_Text_23C800: @ 823C800
+SSTidalCorridor_Text_Cabin2: @ 823C800
 	.string "Cabin 2$"
 
-SSTidalCorridor_Text_23C808: @ 823C808
+SSTidalCorridor_Text_Cabin3: @ 823C808
 	.string "Cabin 3$"
 
-SSTidalCorridor_Text_23C810: @ 823C810
+SSTidalCorridor_Text_Cabin4: @ 823C810
 	.string "Cabin 4$"
diff --git a/data/maps/SSTidalLowerDeck/map.json b/data/maps/SSTidalLowerDeck/map.json
index 3e678ca8c..45610454a 100644
--- a/data/maps/SSTidalLowerDeck/map.json
+++ b/data/maps/SSTidalLowerDeck/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalLowerDeck_EventScript_23C819",
+      "script": "SSTidalLowerDeck_EventScript_Phillip",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 4,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalLowerDeck_EventScript_23C830",
+      "script": "SSTidalLowerDeck_EventScript_Leonard",
       "flag": "0"
     }
   ],
diff --git a/data/maps/SSTidalLowerDeck/scripts.inc b/data/maps/SSTidalLowerDeck/scripts.inc
index 68761376d..c90366c23 100644
--- a/data/maps/SSTidalLowerDeck/scripts.inc
+++ b/data/maps/SSTidalLowerDeck/scripts.inc
@@ -1,38 +1,38 @@
 SSTidalLowerDeck_MapScripts:: @ 823C818
 	.byte 0
 
-SSTidalLowerDeck_EventScript_23C819:: @ 823C819
-	trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_23C847, SSTidalLowerDeck_Text_23C8A0
-	msgbox SSTidalLowerDeck_Text_23C8B4, MSGBOX_AUTOCLOSE
+SSTidalLowerDeck_EventScript_Phillip:: @ 823C819
+	trainerbattle_single TRAINER_PHILLIP, SSTidalLowerDeck_Text_PhillipIntro, SSTidalLowerDeck_Text_PhillipDefeat
+	msgbox SSTidalLowerDeck_Text_PhillipPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalLowerDeck_EventScript_23C830:: @ 823C830
-	trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_23C917, SSTidalLowerDeck_Text_23C97D
-	msgbox SSTidalLowerDeck_Text_23C98E, MSGBOX_AUTOCLOSE
+SSTidalLowerDeck_EventScript_Leonard:: @ 823C830
+	trainerbattle_single TRAINER_LEONARD, SSTidalLowerDeck_Text_LeonardIntro, SSTidalLowerDeck_Text_LeonardDefeat
+	msgbox SSTidalLowerDeck_Text_LeonardPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalLowerDeck_Text_23C847: @ 823C847
+SSTidalLowerDeck_Text_PhillipIntro: @ 823C847
 	.string "Arrrgh! I'm fed up and dog-tired of\n"
 	.string "cleaning this huge place!\p"
 	.string "Let's have a quick battle!$"
 
-SSTidalLowerDeck_Text_23C8A0: @ 823C8A0
+SSTidalLowerDeck_Text_PhillipDefeat: @ 823C8A0
 	.string "Little bro, I lost!$"
 
-SSTidalLowerDeck_Text_23C8B4: @ 823C8B4
+SSTidalLowerDeck_Text_PhillipPostBattle: @ 823C8B4
 	.string "We're the CLEANUP BROTHERS!\p"
 	.string "The old one dumps the detergent,\n"
 	.string "and the young one does the scrubbing!$"
 
-SSTidalLowerDeck_Text_23C917: @ 823C917
+SSTidalLowerDeck_Text_LeonardIntro: @ 823C917
 	.string "This is the bottom of the ship's hull.\n"
 	.string "There's plenty of room.\l"
 	.string "It'll be alright for a POKéMON battle.$"
 
-SSTidalLowerDeck_Text_23C97D: @ 823C97D
+SSTidalLowerDeck_Text_LeonardDefeat: @ 823C97D
 	.string "Big bro, I lost!$"
 
-SSTidalLowerDeck_Text_23C98E: @ 823C98E
+SSTidalLowerDeck_Text_LeonardPostBattle: @ 823C98E
 	.string "We're the CLEANUP BROTHERS!\p"
 	.string "The old one dumps the detergent,\n"
 	.string "and the young one does the scrubbing!$"
diff --git a/data/maps/SSTidalRooms/map.json b/data/maps/SSTidalRooms/map.json
index 8fb4bd05d..b2da534c3 100644
--- a/data/maps/SSTidalRooms/map.json
+++ b/data/maps/SSTidalRooms/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CA49",
+      "script": "SSTidalRooms_EventScript_Colton",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalRooms_EventScript_23CA60",
+      "script": "SSTidalRooms_EventScript_Micah",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CA77",
+      "script": "SSTidalRooms_EventScript_Thomas",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "SSTidalRooms_EventScript_23CA8E",
+      "script": "SSTidalRooms_EventScript_Jed",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "SSTidalRooms_EventScript_23CAA9",
+      "script": "SSTidalRooms_EventScript_Lea",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "SSTidalRooms_EventScript_23CAC4",
+      "script": "SSTidalRooms_EventScript_Garret",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23CADB",
+      "script": "SSTidalRooms_EventScript_Naomi",
       "flag": "0"
     },
     {
@@ -115,7 +115,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "SSTidalRooms_EventScript_23C9F2",
+      "script": "SSTidalRooms_EventScript_SnatchGiver",
       "flag": "FLAG_HIDE_SS_TIDAL_ROOMS_SNATCH_GIVER"
     }
   ],
@@ -213,7 +213,7 @@
       "y": 11,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalRooms_EventScript_23CA33"
+      "script": "SSTidalRooms_EventScript_Bed"
     },
     {
       "type": "sign",
@@ -221,7 +221,7 @@
       "y": 12,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "SSTidalRooms_EventScript_23CA33"
+      "script": "SSTidalRooms_EventScript_Bed"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc
index 3b8df90a3..bf2c5e36b 100644
--- a/data/maps/SSTidalRooms/scripts.inc
+++ b/data/maps/SSTidalRooms/scripts.inc
@@ -1,175 +1,175 @@
 SSTidalRooms_MapScripts:: @ 823C9F1
 	.byte 0
 
-SSTidalRooms_EventScript_23C9F2:: @ 823C9F2
+SSTidalRooms_EventScript_SnatchGiver:: @ 823C9F2
 	lock
 	faceplayer
-	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_23CA29
-	msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT
+	goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_ExplainSnatch
+	msgbox SSTidalRooms_Text_NotSuspiciousTakeThis, MSGBOX_DEFAULT
 	giveitem_std ITEM_TM49
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, FALSE
 	goto_if_eq Common_EventScript_ShowBagIsFull
 	setflag FLAG_RECEIVED_TM49
-	msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT
+	msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalRooms_EventScript_23CA29:: @ 823CA29
-	msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT
+SSTidalRooms_EventScript_ExplainSnatch:: @ 823CA29
+	msgbox SSTidalRooms_Text_ExplainSnatch, MSGBOX_DEFAULT
 	release
 	end
 
-SSTidalRooms_EventScript_23CA33:: @ 823CA33
+SSTidalRooms_EventScript_Bed:: @ 823CA33
 	lockall
-	msgbox SSTidalRooms_Text_23CAF2, MSGBOX_DEFAULT
+	msgbox SSTidalRooms_Text_TakeRestOnBed, MSGBOX_DEFAULT
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
-	call SSTidalRooms_EventScript_23C0A7
+	call SSTidalRooms_EventScript_ProgessCruiseAfterBed
 	releaseall
 	end
 
-SSTidalRooms_EventScript_23CA49:: @ 823CA49
-	trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_23CB14, SSTidalRooms_Text_23CB58
-	msgbox SSTidalRooms_Text_23CB75, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Colton:: @ 823CA49
+	trainerbattle_single TRAINER_COLTON, SSTidalRooms_Text_ColtonIntro, SSTidalRooms_Text_ColtonDefeat
+	msgbox SSTidalRooms_Text_ColtonPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA60:: @ 823CA60
-	trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_23CBEB, SSTidalRooms_Text_23CC04
-	msgbox SSTidalRooms_Text_23CC26, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Micah:: @ 823CA60
+	trainerbattle_single TRAINER_MICAH, SSTidalRooms_Text_MicahIntro, SSTidalRooms_Text_MicahDefeat
+	msgbox SSTidalRooms_Text_MicahPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA77:: @ 823CA77
-	trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_23CC68, SSTidalRooms_Text_23CC8A
-	msgbox SSTidalRooms_Text_23CCBB, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Thomas:: @ 823CA77
+	trainerbattle_single TRAINER_THOMAS, SSTidalRooms_Text_ThomasIntro, SSTidalRooms_Text_ThomasDefeat
+	msgbox SSTidalRooms_Text_ThomasPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CA8E:: @ 823CA8E
-	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CD04, SSTidalRooms_Text_23CD54, SSTidalRooms_Text_23CDC6
-	msgbox SSTidalRooms_Text_23CD5F, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Jed:: @ 823CA8E
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_JedIntro, SSTidalRooms_Text_JedDefeat, SSTidalRooms_Text_JedNotEnoughMons
+	msgbox SSTidalRooms_Text_JedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CAA9:: @ 823CAA9
-	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_23CE04, SSTidalRooms_Text_23CE4B, SSTidalRooms_Text_23CEB0
-	msgbox SSTidalRooms_Text_23CE59, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Lea:: @ 823CAA9
+	trainerbattle_double TRAINER_LEA_AND_JED, SSTidalRooms_Text_LeaIntro, SSTidalRooms_Text_LeaDefeat, SSTidalRooms_Text_LeaNotEnoughMons
+	msgbox SSTidalRooms_Text_LeaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CAC4:: @ 823CAC4
-	trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_23CEEE, SSTidalRooms_Text_23CF36
-	msgbox SSTidalRooms_Text_23CF45, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Garret:: @ 823CAC4
+	trainerbattle_single TRAINER_GARRET, SSTidalRooms_Text_GarretIntro, SSTidalRooms_Text_GarretDefeat
+	msgbox SSTidalRooms_Text_GarretPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_EventScript_23CADB:: @ 823CADB
-	trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_23CF97, SSTidalRooms_Text_23CFF4
-	msgbox SSTidalRooms_Text_23D013, MSGBOX_AUTOCLOSE
+SSTidalRooms_EventScript_Naomi:: @ 823CADB
+	trainerbattle_single TRAINER_NAOMI, SSTidalRooms_Text_NaomiIntro, SSTidalRooms_Text_NaomiDefeat
+	msgbox SSTidalRooms_Text_NaomiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-SSTidalRooms_Text_23CAF2: @ 823CAF2
+SSTidalRooms_Text_TakeRestOnBed: @ 823CAF2
 	.string "There's a bed…\n"
 	.string "Let's take a rest.$"
 
-SSTidalRooms_Text_23CB14: @ 823CB14
+SSTidalRooms_Text_ColtonIntro: @ 823CB14
 	.string "I often sail to LILYCOVE CITY.\p"
 	.string "I enjoy attending CONTESTS,\n"
 	.string "you see.$"
 
-SSTidalRooms_Text_23CB58: @ 823CB58
+SSTidalRooms_Text_ColtonDefeat: @ 823CB58
 	.string "That was an enjoyable match!$"
 
-SSTidalRooms_Text_23CB75: @ 823CB75
+SSTidalRooms_Text_ColtonPostBattle: @ 823CB75
 	.string "I get so excited imagining what kinds\n"
 	.string "of POKéMON I'll get to see in the next\l"
 	.string "CONTEST. The anticipation of it thrills!$"
 
-SSTidalRooms_Text_23CBEB: @ 823CBEB
+SSTidalRooms_Text_MicahIntro: @ 823CBEB
 	.string "Are your friends strong?$"
 
-SSTidalRooms_Text_23CC04: @ 823CC04
+SSTidalRooms_Text_MicahDefeat: @ 823CC04
 	.string "Your friends are, indeed, strong.$"
 
-SSTidalRooms_Text_23CC26: @ 823CC26
+SSTidalRooms_Text_MicahPostBattle: @ 823CC26
 	.string "Friends need not be human.\n"
 	.string "For me, POKéMON are treasured friends!$"
 
-SSTidalRooms_Text_23CC68: @ 823CC68
+SSTidalRooms_Text_ThomasIntro: @ 823CC68
 	.string "Child…\n"
 	.string "Did you knock on the door?$"
 
-SSTidalRooms_Text_23CC8A: @ 823CC8A
+SSTidalRooms_Text_ThomasDefeat: @ 823CC8A
 	.string "A loss is to be accepted without haste\n"
 	.string "or panic.$"
 
-SSTidalRooms_Text_23CCBB: @ 823CCBB
+SSTidalRooms_Text_ThomasPostBattle: @ 823CCBB
 	.string "To be never ruffled in any situation is\n"
 	.string "the GENTLEMAN's code of conduct.$"
 
-SSTidalRooms_Text_23CD04: @ 823CD04
+SSTidalRooms_Text_JedIntro: @ 823CD04
 	.string "JED: I feel a little shy about this, but…\n"
 	.string "We'll show you our lovey-dovey power!$"
 
-SSTidalRooms_Text_23CD54: @ 823CD54
+SSTidalRooms_Text_JedDefeat: @ 823CD54
 	.string "JED: Sigh…$"
 
-SSTidalRooms_Text_23CD5F: @ 823CD5F
+SSTidalRooms_Text_JedPostBattle: @ 823CD5F
 	.string "JED: It's the first time that our lovey-\n"
 	.string "dovey power couldn't prevail!\l"
 	.string "You must be an awesome TRAINER!$"
 
-SSTidalRooms_Text_23CDC6: @ 823CDC6
+SSTidalRooms_Text_JedNotEnoughMons: @ 823CDC6
 	.string "JED: You only have one POKéMON?\n"
 	.string "Isn't that just too lonesome?$"
 
-SSTidalRooms_Text_23CE04: @ 823CE04
+SSTidalRooms_Text_LeaIntro: @ 823CE04
 	.string "LEA: I feel a little silly, but…\n"
 	.string "We'll show you our lovey-dovey power!$"
 
-SSTidalRooms_Text_23CE4B: @ 823CE4B
+SSTidalRooms_Text_LeaDefeat: @ 823CE4B
 	.string "LEA: Oh, boo!$"
 
-SSTidalRooms_Text_23CE59: @ 823CE59
+SSTidalRooms_Text_LeaPostBattle: @ 823CE59
 	.string "LEA: I can't believe it!\n"
 	.string "Our lovey-dovey power failed…\l"
 	.string "You must be an awesome TRAINER!$"
 
-SSTidalRooms_Text_23CEB0: @ 823CEB0
+SSTidalRooms_Text_LeaNotEnoughMons: @ 823CEB0
 	.string "LEA: I wanted to battle…\n"
 	.string "But you don't even have two POKéMON…$"
 
-SSTidalRooms_Text_23CEEE: @ 823CEEE
+SSTidalRooms_Text_GarretIntro: @ 823CEEE
 	.string "Ah, you've come just in time.\p"
 	.string "I'm bored, you see.\n"
 	.string "You may entertain me.$"
 
-SSTidalRooms_Text_23CF36: @ 823CF36
+SSTidalRooms_Text_GarretDefeat: @ 823CF36
 	.string "…That will do.$"
 
-SSTidalRooms_Text_23CF45: @ 823CF45
+SSTidalRooms_Text_GarretPostBattle: @ 823CF45
 	.string "Perhaps I shall get Father to acquire\n"
 	.string "a yacht for me.\l"
 	.string "A yacht for me and POKéMON!$"
 
-SSTidalRooms_Text_23CF97: @ 823CF97
+SSTidalRooms_Text_NaomiIntro: @ 823CF97
 	.string "Oh, you're such an adorable TRAINER.\n"
 	.string "Would you like to have tea?\l"
 	.string "Or would you rather battle?$"
 
-SSTidalRooms_Text_23CFF4: @ 823CFF4
+SSTidalRooms_Text_NaomiDefeat: @ 823CFF4
 	.string "I see.\n"
 	.string "You're the active sort.$"
 
-SSTidalRooms_Text_23D013: @ 823D013
+SSTidalRooms_Text_NaomiPostBattle: @ 823D013
 	.string "A world cruise on a luxury liner has its\n"
 	.string "charms, I must say…\p"
 	.string "But, I will admit there is an appealing\n"
 	.string "side to touring HOENN by ferry.$"
 
-SSTidalRooms_Text_23D098: @ 823D098
+SSTidalRooms_Text_NotSuspiciousTakeThis: @ 823D098
 	.string "Uh… Hi! I… I'm not acting suspicious!\n"
 	.string "Uh… You can have this! For free!\p"
 	.string "It… Honestly, I didn't SNATCH it from\n"
 	.string "someone! I'd never do such a thing!\l"
 	.string "It's clean! You can use it!$"
 
-SSTidalRooms_Text_23D145: @ 823D145
+SSTidalRooms_Text_ExplainSnatch: @ 823D145
 	.string "SNATCH steals the beneficial effects\n"
 	.string "of certain moves before they can be\l"
 	.string "used by a foe or ally.$"
diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc
index bf30da747..1abb66b57 100644
--- a/data/maps/SlateportCity_Harbor/scripts.inc
+++ b/data/maps/SlateportCity_Harbor/scripts.inc
@@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_Lilycove:: @ 820CB92
 	msgbox SlateportCity_Harbor_Text_LilycoveItIs, MSGBOX_YESNO
 	compare VAR_RESULT, NO
 	goto_if_eq SlateportCity_Harbor_EventScript_ChooseNewDestination
-	setvar VAR_PORTHOLE_STATE, 1
+	setvar VAR_SS_TIDAL_STATE, SS_TIDAL_BOARD_SLATEPORT
 	call SlateportCity_Harbor_EventScript_BoardFerry
 	warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10
 	waitstate
diff --git a/data/specials.inc b/data/specials.inc
index 25be90ced..386154ebd 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -281,7 +281,7 @@ gSpecials:: @ 81DBA64
 	def_special CheckLeadMonCute
 	def_special CheckLeadMonSmart
 	def_special CheckLeadMonTough
-	def_special sub_80FB7A4
+	def_special LookThroughPorthole
 	def_special DoSoftReset
 	def_special GameClear
 	def_special MoveElevator