Document Trainer Hill

13 files changed, 252 insertions, 263 deletions

diff --git a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
index 98d7a22b0..1bcf1814a 100644
--- a/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
+++ b/data/maps/BattleFrontier_BattlePyramidEmptySquare/scripts.inc
@@ -152,6 +152,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252C45:: @ 8252C45
 	waitstate
 	end
 
+@ TRAINER_PHILLIP is used as a placeholder
 BattlePyramid_TrainerBattle:: @ 8252C4F
 	trainerbattle TRAINER_BATTLE_PYRAMID, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
 	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT
diff --git a/data/maps/TrainerHill_1F/scripts.inc b/data/maps/TrainerHill_1F/scripts.inc
index e726f8566..59f90b8bd 100644
--- a/data/maps/TrainerHill_1F/scripts.inc
+++ b/data/maps/TrainerHill_1F/scripts.inc
@@ -1,6 +1,6 @@
 TrainerHill_1F_MapScripts:: @ 8268F71
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_1F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_1F_MapScript2_2C8372
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_1F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_2F/scripts.inc b/data/maps/TrainerHill_2F/scripts.inc
index dd1f356de..0e8775cd5 100644
--- a/data/maps/TrainerHill_2F/scripts.inc
+++ b/data/maps/TrainerHill_2F/scripts.inc
@@ -1,6 +1,6 @@
 TrainerHill_2F_MapScripts:: @ 8268F81
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_2F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_2F_MapScript2_2C8372
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_2F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, TrainerHill_OnWarp
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_3F/scripts.inc b/data/maps/TrainerHill_3F/scripts.inc
index b4793f457..eee6bd99d 100644
--- a/data/maps/TrainerHill_3F/scripts.inc
+++ b/data/maps/TrainerHill_3F/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_3F_MapScripts:: @ 8268F91
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_3F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_3F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_4F/scripts.inc b/data/maps/TrainerHill_4F/scripts.inc
index 66b8ed3bb..74ce0bf08 100644
--- a/data/maps/TrainerHill_4F/scripts.inc
+++ b/data/maps/TrainerHill_4F/scripts.inc
@@ -1,5 +1,5 @@
 TrainerHill_4F_MapScripts:: @ 8268F9C
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_4F_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_4F_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
diff --git a/data/maps/TrainerHill_Elevator/map.json b/data/maps/TrainerHill_Elevator/map.json
index 03354b0da..07cdaa80d 100644
--- a/data/maps/TrainerHill_Elevator/map.json
+++ b/data/maps/TrainerHill_Elevator/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Elevator_EventScript_26935F",
+      "script": "TrainerHill_Elevator_EventScript_Attendant",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TrainerHill_Elevator/scripts.inc b/data/maps/TrainerHill_Elevator/scripts.inc
index 39fa51db4..498f7a3c0 100644
--- a/data/maps/TrainerHill_Elevator/scripts.inc
+++ b/data/maps/TrainerHill_Elevator/scripts.inc
@@ -1,89 +1,89 @@
 TrainerHill_Elevator_MapScripts:: @ 826934F
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_MapScript2_269355
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Elevator_OnFrame
 	.byte 0
 
-TrainerHill_Elevator_MapScript2_269355: @ 8269355
-	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_269375
+TrainerHill_Elevator_OnFrame: @ 8269355
+	map_script_2 VAR_TEMP_4, 0, TrainerHill_Elevator_EventScript_EnterElevator
 	.2byte 0
 
-TrainerHill_Elevator_EventScript_26935F:: @ 826935F
+TrainerHill_Elevator_EventScript_Attendant:: @ 826935F
 	end
 
-TrainerHill_Elevator_EventScript_269360:: @ 8269360
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693EB
+TrainerHill_Elevator_EventScript_ExitToRoof:: @ 8269360
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof
 	waitmovement 0
 	releaseall
 	warp MAP_TRAINER_HILL_ROOF, 255, 15, 5
 	waitstate
 	end
 
-TrainerHill_Elevator_EventScript_269375:: @ 8269375
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E4
+TrainerHill_Elevator_EventScript_EnterElevator:: @ 8269375
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerApproachAttendant
 	waitmovement 0
-	applymovement 1, TrainerHill_Elevator_Movement_2693EE
+	applymovement 1, TrainerHill_Elevator_Movement_AttendantFacePlayer
 	waitmovement 0
 	lockall
-	msgbox TrainerHill_Elevator_Text_268F3E, MSGBOX_YESNO
+	msgbox TrainerHill_Elevator_Text_ReturnToReception, MSGBOX_YESNO
 	compare VAR_RESULT, NO
-	goto_if_eq TrainerHill_Elevator_EventScript_269360
+	goto_if_eq TrainerHill_Elevator_EventScript_ExitToRoof
 	releaseall
-	applymovement 1, TrainerHill_Elevator_Movement_2693F0
+	applymovement 1, TrainerHill_Elevator_Movement_AttendantFaceDown
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693DF
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator
 	waitmovement 0
-	call TrainerHill_Elevator_EventScript_2693D9
+	call TrainerHill_Elevator_EventScript_MoveElevator
 	delay 25
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_2693E7
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Elevator_Movement_PlayerExitElevator
 	waitmovement 0
 	warp MAP_TRAINER_HILL_ENTRANCE, 255, 17, 8
 	waitstate
 	end
 
 @ Unused
-TrainerHill_Elevator_EventScript_2693CE:: @ 82693CE
-	goto TrainerHill_Elevator_EventScript_2693D4
+TrainerHill_Elevator_EventScript_ExitFloorSelect:: @ 82693CE
+	goto TrainerHill_Elevator_EventScript_CloseFloorSelect
 	end
 
 @ Functionally unused
-TrainerHill_Elevator_EventScript_2693D4:: @ 82693D4
+TrainerHill_Elevator_EventScript_CloseFloorSelect:: @ 82693D4
 	special CloseDeptStoreElevatorWindow
 	releaseall
 	end
 
-TrainerHill_Elevator_EventScript_2693D9:: @ 82693D9
+TrainerHill_Elevator_EventScript_MoveElevator:: @ 82693D9
 	waitse
 	special MoveElevator
 	waitstate
 	return
 
-TrainerHill_Elevator_Movement_2693DF: @ 82693DF
+TrainerHill_Elevator_Movement_PlayerMoveToCenterOfElevator: @ 82693DF
 	walk_up
 	walk_up
 	walk_right
 	face_down
 	step_end
 
-TrainerHill_Elevator_Movement_2693E4: @ 82693E4
+TrainerHill_Elevator_Movement_PlayerApproachAttendant: @ 82693E4
 	delay_16
 	walk_left
 	step_end
 
-TrainerHill_Elevator_Movement_2693E7: @ 82693E7
+TrainerHill_Elevator_Movement_PlayerExitElevator: @ 82693E7
 	delay_16
 	walk_down
 	walk_down
 	step_end
 
-TrainerHill_Elevator_Movement_2693EB: @ 82693EB
+TrainerHill_Elevator_Movement_PlayerExitElevatorToRoof: @ 82693EB
 	face_down
 	delay_16
 	step_end
 
-TrainerHill_Elevator_Movement_2693EE: @ 82693EE
+TrainerHill_Elevator_Movement_AttendantFacePlayer: @ 82693EE
 	face_right
 	step_end
 
-TrainerHill_Elevator_Movement_2693F0: @ 82693F0
+TrainerHill_Elevator_Movement_AttendantFaceDown: @ 82693F0
 	face_down
 	step_end
 
diff --git a/data/maps/TrainerHill_Entrance/map.json b/data/maps/TrainerHill_Entrance/map.json
index 42f1daa9d..f581988b6 100644
--- a/data/maps/TrainerHill_Entrance/map.json
+++ b/data/maps/TrainerHill_Entrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2681FD",
+      "script": "TrainerHill_Entrance_EventScript_Attendant",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2681EF",
+      "script": "TrainerHill_Entrance_EventScript_Nurse",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2683C7",
+      "script": "TrainerHill_Entrance_EventScript_Clerk",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_2683AC",
+      "script": "TrainerHill_Entrance_EventScript_Girl",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Entrance_EventScript_268391",
+      "script": "TrainerHill_Entrance_EventScript_Man",
       "flag": "0"
     }
   ],
@@ -111,7 +111,7 @@
       "elevation": 3,
       "var": "VAR_TRAINER_HILL_IS_ACTIVE",
       "var_value": "0",
-      "script": "TrainerHill_Entrance_EventScript_268229"
+      "script": "TrainerHill_Entrance_EventScript_EntryTrigger"
     }
   ],
   "bg_events": [
@@ -121,7 +121,7 @@
       "y": 10,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "TrainerHill_Entrance_EventScript_268388"
+      "script": "TrainerHill_Entrance_EventScript_Records"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/TrainerHill_Entrance/scripts.inc b/data/maps/TrainerHill_Entrance/scripts.inc
index 3b9fb77a4..77cd8daa0 100644
--- a/data/maps/TrainerHill_Entrance/scripts.inc
+++ b/data/maps/TrainerHill_Entrance/scripts.inc
@@ -1,9 +1,9 @@
 TrainerHill_Entrance_MapScripts:: @ 82680AC
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_MapScript1_2680D0
-	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_MapScript1_26811B
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Entrance_OnResume
+	map_script MAP_SCRIPT_ON_RETURN_TO_FIELD, TrainerHill_Entrance_OnReturn
 	map_script MAP_SCRIPT_ON_TRANSITION, TrainerHill_Entrance_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_MapScript1_268128
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_MapScript2_26813E
+	map_script MAP_SCRIPT_ON_LOAD, TrainerHill_Entrance_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Entrance_OnFrame
 	.byte 0
 
 TrainerHill_Entrance_OnTransition: @ 82680C6
@@ -11,58 +11,59 @@ TrainerHill_Entrance_OnTransition: @ 82680C6
 	getplayerxy VAR_TEMP_D, VAR_RESULT
 	end
 
-TrainerHill_Entrance_MapScript1_2680CF: @ 82680CF
+@ Unused
+TrainerHill_Entrance_OnWarp: @ 82680CF
 	end
 
-TrainerHill_Entrance_MapScript1_2680D0: @ 82680D0
+TrainerHill_Entrance_OnResume: @ 82680D0
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_0, 0
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_9
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_2680FF
+	compare VAR_RESULT, 0  @ VAR_RESULT always 0 here
+	goto_if_eq TrainerHill_Entrance_EventScript_TryFaceAttendant
 	setobjectxy EVENT_OBJ_ID_PLAYER, 9, 6
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	end
 
-TrainerHill_Entrance_EventScript_2680FF:: @ 82680FF
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_16
+TrainerHill_Entrance_EventScript_TryFaceAttendant:: @ 82680FF
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_WON
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
-	goto_if_eq TrainerHill_Entrance_EventScript_26811A
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
 	end
 
-TrainerHill_Entrance_EventScript_26811A:: @ 826811A
+TrainerHill_Entrance_EventScript_PlayerDontFaceAttendant:: @ 826811A
 	end
 
-TrainerHill_Entrance_MapScript1_26811B: @ 826811B
+TrainerHill_Entrance_OnReturn: @ 826811B
 	addobject 2
 	addobject 1
 	addobject 5
 	addobject 4
 	end
 
-TrainerHill_Entrance_MapScript1_268128: @ 8268128
+TrainerHill_Entrance_OnLoad: @ 8268128
 	compare VAR_TEMP_D, 17
-	call_if_eq TrainerHill_Entrance_EventScript_268134
+	call_if_eq TrainerHill_Entrance_EventScript_OpenCounterDoor
 	end
 
-TrainerHill_Entrance_EventScript_268134:: @ 8268134
+TrainerHill_Entrance_EventScript_OpenCounterDoor:: @ 8268134
 	setmetatile 17, 10, METATILE_TrainerHill_GreenFloorTile, 0
 	return
 
-TrainerHill_Entrance_MapScript2_26813E: @ 826813E
-	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_268182
-	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_268160
-	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_268229
-	map_script_2 VAR_TEMP_1, 1, TrainerHill_Entrance_EventScript_2C83DF
+TrainerHill_Entrance_OnFrame: @ 826813E
+	map_script_2 VAR_TEMP_0, 0, TrainerHill_Entrance_EventScript_ExitChallenge
+	map_script_2 VAR_TEMP_D, 17, TrainerHill_Entrance_EventScript_ExitElevator
+	map_script_2 VAR_TEMP_5, 1, TrainerHill_Entrance_EventScript_EntryTrigger
+	map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
 	.2byte 0
 
-TrainerHill_Entrance_EventScript_268160:: @ 8268160
+TrainerHill_Entrance_EventScript_ExitElevator:: @ 8268160
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268385
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerExitElevator
 	waitmovement 0
 	setmetatile 17, 10, METATILE_TrainerHill_CounterDoor, 1
 	special DrawWholeMapView
@@ -72,38 +73,36 @@ TrainerHill_Entrance_EventScript_268160:: @ 8268160
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268182:: @ 8268182
+TrainerHill_Entrance_EventScript_ExitChallenge:: @ 8268182
 	setvar VAR_TEMP_0, 1
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_STATUS
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_2681B5
-	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_2681CA
-	case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_2681EE
+	case TRAINER_HILL_PLAYER_STATUS_LOST, TrainerHill_Entrance_EventScript_ExitChallengeLost
+	case TRAINER_HILL_PLAYER_STATUS_ECARD_SCANNED, TrainerHill_Entrance_EventScript_ExitChallengeECard
+	case TRAINER_HILL_PLAYER_STATUS_NORMAL, TrainerHill_Entrance_EventScript_EndExitChallenge
 
-TrainerHill_Entrance_EventScript_2681B5:: @ 82681B5
+TrainerHill_Entrance_EventScript_ExitChallengeLost:: @ 82681B5
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	msgbox TrainerHill_Entrance_Text_268689, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_2681DA
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	msgbox TrainerHill_Entrance_Text_TooBadTremendousEffort, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_PlayerExitChallenge
 
-TrainerHill_Entrance_EventScript_2681CA:: @ 82681CA
+TrainerHill_Entrance_EventScript_ExitChallengeECard:: @ 82681CA
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	msgbox TrainerHill_Entrance_Text_268712, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_2681DA:: @ 82681DA
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	msgbox TrainerHill_Entrance_Text_MovedReceptionHereForSwitch, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_PlayerExitChallenge:: @ 82681DA
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 0
 	special HealPlayerParty
 	releaseall
-
-TrainerHill_Entrance_EventScript_2681EE:: @ 82681EE
+TrainerHill_Entrance_EventScript_EndExitChallenge:: @ 82681EE
 	end
 
-TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
+TrainerHill_Entrance_EventScript_Nurse:: @ 82681EF
 	setvar VAR_0x800B, 2
 	call Common_EventScript_PkmnCenterNurse
 	waitmessage
@@ -111,115 +110,113 @@ TrainerHill_Entrance_EventScript_2681EF:: @ 82681EF
 	release
 	end
 
-TrainerHill_Entrance_EventScript_2681FD:: @ 82681FD
+TrainerHill_Entrance_EventScript_Attendant:: @ 82681FD
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_26821F
-	msgbox TrainerHill_Entrance_Text_2686F4, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_268227
-
-TrainerHill_Entrance_EventScript_26821F:: @ 826821F
-	msgbox TrainerHill_Entrance_Text_2687AC, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_268227:: @ 8268227
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerHill_Entrance_EventScript_ThanksForPlaying
+	msgbox TrainerHill_Entrance_Text_HopeYouGiveItYourBest, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AttendantEnd
+
+TrainerHill_Entrance_EventScript_ThanksForPlaying:: @ 826821F
+	msgbox TrainerHill_Entrance_Text_ThankYouForPlaying, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_AttendantEnd:: @ 8268227
 	release
 	end
 
-TrainerHill_Entrance_EventScript_268229:: @ 8268229
+TrainerHill_Entrance_EventScript_EntryTrigger:: @ 8268229
 	lockall
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_26837F
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_26836A
-	msgbox TrainerHill_Entrance_Text_2684C6, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_13
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PlayerFaceAttendant
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_Closed
+	msgbox TrainerHill_Entrance_Text_WelcomeToTrainerHill, MSGBOX_DEFAULT
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_GAME_SAVED
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 0
-	call_if_eq TrainerHill_Entrance_EventScript_26832E
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_8
+	compare VAR_RESULT, FALSE
+	call_if_eq TrainerHill_Entrance_EventScript_SaveGame
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_ALL_FLOORS_USED
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
-	goto_if_eq TrainerHill_Entrance_EventScript_268275
-	msgbox TrainerHill_Entrance_Text_268564, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_26827D
-
-TrainerHill_Entrance_EventScript_268275:: @ 8268275
-	msgbox TrainerHill_Entrance_Text_26859E, MSGBOX_DEFAULT
-
-TrainerHill_Entrance_EventScript_26827D:: @ 826827D
-	message TrainerHill_Entrance_Text_2685F8
+	compare VAR_RESULT, TRUE
+	goto_if_eq TrainerHill_Entrance_EventScript_AllFloorsUsed
+	msgbox TrainerHill_Entrance_Text_TrainersUpToFloorX, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
+
+TrainerHill_Entrance_EventScript_AllFloorsUsed:: @ 8268275
+	msgbox TrainerHill_Entrance_Text_TrainersInEveryRoom, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_AskChallengeTrainers:: @ 826827D
+	message TrainerHill_Entrance_Text_LikeToChallengeTrainers
 	waitmessage
 	multichoice 15, 6, MULTI_YESNOINFO, 0
 	switch VAR_RESULT
-	case 0, TrainerHill_Entrance_EventScript_2682C8
-	case 1, TrainerHill_Entrance_EventScript_268314
-	case 2, TrainerHill_Entrance_EventScript_2682BA
-	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_268314
+	case 0, TrainerHill_Entrance_EventScript_ChooseChallenge
+	case 1, TrainerHill_Entrance_EventScript_CancelEntry
+	case 2, TrainerHill_Entrance_EventScript_Info
+	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
-TrainerHill_Entrance_EventScript_2682BA:: @ 82682BA
-	msgbox TrainerHill_Entrance_Text_2687C3, MSGBOX_DEFAULT
-	goto TrainerHill_Entrance_EventScript_26827D
+TrainerHill_Entrance_EventScript_Info:: @ 82682BA
+	msgbox TrainerHill_Entrance_Text_ExplainTrainerHill, MSGBOX_DEFAULT
+	goto TrainerHill_Entrance_EventScript_AskChallengeTrainers
 	end
 
-TrainerHill_Entrance_EventScript_2682C8:: @ 82682C8
+TrainerHill_Entrance_EventScript_ChooseChallenge:: @ 82682C8
 	multichoice 13, 2, MULTI_TAG_MATCH_TYPE, 0
 	switch VAR_RESULT
-	case 4, TrainerHill_Entrance_EventScript_268314
-	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_268314
+	case 4, TrainerHill_Entrance_EventScript_CancelEntry
+	case MULTI_B_PRESSED, TrainerHill_Entrance_EventScript_CancelEntry
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_TAG
 	copyvar VAR_0x8005, VAR_RESULT
 	special CallTrainerHillFunction
 	setvar VAR_TRAINER_HILL_IS_ACTIVE, 1
 	setvar VAR_TEMP_5, 0
 	special HealPlayerParty
-	msgbox TrainerHill_Entrance_Text_26862A, MSGBOX_DEFAULT
+	msgbox TrainerHill_Entrance_Text_TimeProgessGetSetGo, MSGBOX_DEFAULT
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_START
 	special CallTrainerHillFunction
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268314:: @ 8268314
+TrainerHill_Entrance_EventScript_CancelEntry:: @ 8268314
 	setvar VAR_TEMP_5, 0
-	msgbox TrainerHill_Entrance_Text_26866F, MSGBOX_DEFAULT
+	msgbox TrainerHill_Entrance_Text_PleaseVisitUsAgain, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_26832E:: @ 826832E
-	msgbox TrainerHill_Entrance_Text_26851C, MSGBOX_DEFAULT
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_14
+TrainerHill_Entrance_EventScript_SaveGame:: @ 826832E
+	msgbox TrainerHill_Entrance_Text_SaveGameBeforeEnter, MSGBOX_DEFAULT
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_5, 1
 	call Common_EventScript_SaveGame
-	compare VAR_RESULT, 0
-	goto_if_eq TrainerHill_Entrance_EventScript_26835C
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_14
+	compare VAR_RESULT, FALSE
+	goto_if_eq TrainerHill_Entrance_EventScript_SaveFailed
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_GAME_SAVED
 	special CallTrainerHillFunction
 	return
 
-TrainerHill_Entrance_EventScript_26835C:: @ 826835C
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_15
+TrainerHill_Entrance_EventScript_SaveFailed:: @ 826835C
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_GAME_SAVED
 	special CallTrainerHillFunction
-	goto TrainerHill_Entrance_EventScript_268314
+	goto TrainerHill_Entrance_EventScript_CancelEntry
 	end
 
-TrainerHill_Entrance_EventScript_26836A:: @ 826836A
-	msgbox TrainerHill_Entrance_Text_268430, MSGBOX_DEFAULT
+TrainerHill_Entrance_EventScript_Closed:: @ 826836A
+	msgbox TrainerHill_Entrance_Text_StillGettingReady, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_268381
+	applymovement EVENT_OBJ_ID_PLAYER, TrainerHill_Entrance_Movement_PushPlayerBackFromCounter
 	waitmovement 0
 	releaseall
 	end
 
-TrainerHill_Entrance_Movement_26837F: @ 826837F
+TrainerHill_Entrance_Movement_PlayerFaceAttendant: @ 826837F
 	face_right
 	step_end
 
-TrainerHill_Entrance_Movement_268381: @ 8268381
+TrainerHill_Entrance_Movement_PushPlayerBackFromCounter: @ 8268381
 	walk_down
 	step_end
 
@@ -227,12 +224,12 @@ TrainerHill_Entrance_Movement_268383: @ 8268383
 	face_up
 	step_end
 
-TrainerHill_Entrance_Movement_268385: @ 8268385
+TrainerHill_Entrance_Movement_PlayerExitElevator: @ 8268385
 	walk_down
 	walk_down
 	step_end
 
-TrainerHill_Entrance_EventScript_268388:: @ 8268388
+TrainerHill_Entrance_EventScript_Records:: @ 8268388
 	lockall
 	fadescreen 1
 	special ShowTrainerHillRecords
@@ -240,37 +237,37 @@ TrainerHill_Entrance_EventScript_268388:: @ 8268388
 	releaseall
 	end
 
-TrainerHill_Entrance_EventScript_268391:: @ 8268391
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683A3
-	msgbox TrainerHill_Entrance_Text_268D5A, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_Man:: @ 8268391
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ManTrainerHillClosed
+	msgbox TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683A3:: @ 82683A3
-	msgbox TrainerHill_Entrance_Text_268DDA, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_ManTrainerHillClosed:: @ 82683A3
+	msgbox TrainerHill_Entrance_Text_CantWaitToTestTheWaters, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683AC:: @ 82683AC
-	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_2683BE
-	msgbox TrainerHill_Entrance_Text_268E6A, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_Girl:: @ 82683AC
+	goto_if_unset FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_GirlTrainerHillClosed
+	msgbox TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683BE:: @ 82683BE
-	msgbox TrainerHill_Entrance_Text_268EDC, MSGBOX_NPC
+TrainerHill_Entrance_EventScript_GirlTrainerHillClosed:: @ 82683BE
+	msgbox TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen, MSGBOX_NPC
 	end
 
-TrainerHill_Entrance_EventScript_2683C7:: @ 82683C7
+TrainerHill_Entrance_EventScript_Clerk:: @ 82683C7
 	lock
 	faceplayer
 	message gText_HowMayIServeYou
 	waitmessage
-	goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_268402
-	pokemart TrainerHill_Entrance_Pokemart_2683E8
+	goto_if_set FLAG_SYS_GAME_CLEAR, TrainerHill_Entrance_EventScript_ExpandedPokemart
+	pokemart TrainerHill_Entrance_Pokemart_Basic
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
+TrainerHill_Entrance_Pokemart_Basic: @ 82683E8
 	.2byte ITEM_SUPER_POTION
 	.2byte ITEM_ANTIDOTE
 	.2byte ITEM_PARALYZE_HEAL
@@ -286,14 +283,14 @@ TrainerHill_Entrance_Pokemart_2683E8: @ 82683E8
 	release
 	end
 
-TrainerHill_Entrance_EventScript_268402:: @ 8268402
-	pokemart TrainerHill_Entrance_Pokemart_268414
+TrainerHill_Entrance_EventScript_ExpandedPokemart:: @ 8268402
+	pokemart TrainerHill_Entrance_Pokemart_Expanded
 	msgbox gText_PleaseComeAgain, MSGBOX_DEFAULT
 	release
 	end
 
 	.align 2
-TrainerHill_Entrance_Pokemart_268414: @ 8268414
+TrainerHill_Entrance_Pokemart_Expanded: @ 8268414
 	.2byte ITEM_HYPER_POTION
 	.2byte ITEM_MAX_POTION
 	.2byte ITEM_FULL_RESTORE
@@ -310,69 +307,69 @@ TrainerHill_Entrance_Pokemart_268414: @ 8268414
 	release
 	end
 
-TrainerHill_Entrance_Text_268430: @ 8268430
+TrainerHill_Entrance_Text_StillGettingReady: @ 8268430
 	.string "This is the TRAINER HILL where\n"
 	.string "you may enjoy tag battles with many\l"
 	.string "TRAINERS.\p"
 	.string "Unfortunately, we're still getting\n"
 	.string "things ready. Please come back later!$"
 
-TrainerHill_Entrance_Text_2684C6: @ 82684C6
+TrainerHill_Entrance_Text_WelcomeToTrainerHill: @ 82684C6
 	.string "Welcome!\p"
 	.string "This is the TRAINER HILL where\n"
 	.string "you may enjoy tag battles with many\l"
 	.string "TRAINERS!$"
 
-TrainerHill_Entrance_Text_26851C: @ 826851C
+TrainerHill_Entrance_Text_SaveGameBeforeEnter: @ 826851C
 	.string "Is this your first visit here?\p"
 	.string "Before you enter, please save\n"
 	.string "your game.$"
 
-TrainerHill_Entrance_Text_268564: @ 8268564
+TrainerHill_Entrance_Text_TrainersUpToFloorX: @ 8268564
 	.string "Let's see…\n"
 	.string "The TRAINERS here now are…\p"
 	.string "Up to floor no. {STR_VAR_1}.$"
 
-TrainerHill_Entrance_Text_26859E: @ 826859E
+TrainerHill_Entrance_Text_TrainersInEveryRoom: @ 826859E
 	.string "Let's see…\n"
 	.string "The TRAINERS here now are…\p"
 	.string "There appear to be TRAINERS gathered\n"
 	.string "in every room.$"
 
-TrainerHill_Entrance_Text_2685F8: @ 82685F8
+TrainerHill_Entrance_Text_LikeToChallengeTrainers: @ 82685F8
 	.string "Would you like to challenge the\n"
 	.string "waiting TRAINERS?$"
 
-TrainerHill_Entrance_Text_26862A: @ 826862A
+TrainerHill_Entrance_Text_TimeProgessGetSetGo: @ 826862A
 	.string "I will time your progress.\n"
 	.string "Best of luck!\p"
 	.string "On your marks…\p"
 	.string "Get set…\p"
 	.string "Go!$"
 
-TrainerHill_Entrance_Text_26866F: @ 826866F
+TrainerHill_Entrance_Text_PleaseVisitUsAgain: @ 826866F
 	.string "Please do visit us again!$"
 
-TrainerHill_Entrance_Text_268689: @ 8268689
+TrainerHill_Entrance_Text_TooBadTremendousEffort: @ 8268689
 	.string "That was too bad.\p"
 	.string "I think you put in a tremendous\n"
 	.string "effort in your battling.\p"
 	.string "Please come back and try again!$"
 
-TrainerHill_Entrance_Text_2686F4: @ 82686F4
+TrainerHill_Entrance_Text_HopeYouGiveItYourBest: @ 82686F4
 	.string "I hope you give it your best.$"
 
-TrainerHill_Entrance_Text_268712: @ 8268712
+TrainerHill_Entrance_Text_MovedReceptionHereForSwitch: @ 8268712
 	.string "When the TRAINERS switch places,\n"
 	.string "the movement can be hectic.\p"
 	.string "To avoid the stampede, we moved\n"
 	.string "the reception counter here.\p"
 	.string "I'm sorry for the inconvenience.$"
 
-TrainerHill_Entrance_Text_2687AC: @ 82687AC
+TrainerHill_Entrance_Text_ThankYouForPlaying: @ 82687AC
 	.string "Thank you for playing!$"
 
-TrainerHill_Entrance_Text_2687C3: @ 82687C3
+TrainerHill_Entrance_Text_ExplainTrainerHill: @ 82687C3
 	.string "Here at the TRAINER HILL, we conduct\n"
 	.string "an event called the Time Attack.\p"
 	.string "It is a race that measures how long\n"
@@ -385,13 +382,14 @@ TrainerHill_Entrance_Text_2687C3: @ 82687C3
 	.string "neither Exp. Points nor money will\l"
 	.string "be awarded.$"
 
-TrainerHill_Entrance_Text_26890D: @ 826890D
+@ Unused
+TrainerHill_Entrance_Text_NeedAtLeastTwoPokemon: @ 826890D
 	.string "Oh, I'm sorry, but you appear to have\n"
 	.string "only one POKéMON with you.\p"
 	.string "You will need at least two POKéMON\n"
 	.string "to enter this event.$"
 
-TrainerHill_Roof_Text_268986: @ 8268986
+TrainerHill_Roof_Text_YouFinallyCameBravo: @ 8268986
 	.string "Hm! Hm!\p"
 	.string "You finally came!\n"
 	.string "Yes, you have arrived!\p"
@@ -407,15 +405,15 @@ TrainerHill_Roof_Text_268986: @ 8268986
 	.string "Anyway, I watched you on your way up.\n"
 	.string "Marvelous battling! Bravo, indeed!$"
 
-TrainerHill_Roof_Text_268AC5: @ 8268AC5
+TrainerHill_Roof_Text_HaveTheMostMarvelousGift: @ 8268AC5
 	.string "For a marvelous someone like you,\n"
 	.string "I have the most marvelous gift!$"
 
-TrainerHill_Roof_Text_268B07: @ 8268B07
+TrainerHill_Roof_Text_FullUpBeBackLaterForThis: @ 8268B07
 	.string "Oh, no, full up with things!\n"
 	.string "You'll be back later for this!$"
 
-TrainerHill_Roof_Text_268B43: @ 8268B43
+TrainerHill_Roof_Text_GotHereMarvelouslyQuickly: @ 8268B43
 	.string "Oh, hold on here! Did you possibly get\n"
 	.string "here marvelously quickly?\p"
 	.string "How splendid! You needn't have\n"
@@ -423,50 +421,51 @@ TrainerHill_Roof_Text_268B43: @ 8268B43
 	.string "That is so delightful. I'll have the Time\n"
 	.string "Board at the reception updated!$"
 
-TrainerHill_Roof_Text_268C03: @ 8268C03
+TrainerHill_Roof_Text_YouWerentVeryQuick: @ 8268C03
 	.string "But, oh…\n"
 	.string "You weren't very quick getting here.$"
 
-TrainerHill_Roof_Text_268C31: @ 8268C31
+TrainerHill_Roof_Text_ArriveZippierNextTime: @ 8268C31
 	.string "Perhaps it would please me more if you\n"
 	.string "arrived zippier next time.\p"
 	.string "Then, I should be pleased to form\n"
 	.string "a tag team with you!\p"
 	.string "Until we meet again, amigo!$"
 
-TrainerHill_Roof_Text_268CC6: @ 8268CC6
+@ Unused
+TrainerHill_Roof_Text_BuiltTrainerHillToFindPartner: @ 8268CC6
 	.string "I had the TRAINER HILL built for but\n"
 	.string "one reason and one only!\p"
 	.string "To find the most suitable partner\n"
 	.string "with whom I may form a tag team!$"
 
-TrainerHill_Entrance_Text_268D47: @ 8268D47
+TrainerHill_Entrance_Text_ChallengeTime: @ 8268D47
 	.string "{STR_VAR_1} min. {STR_VAR_2}.{STR_VAR_3} sec.$"
 
-TrainerHill_Entrance_Text_268D5A: @ 8268D5A
+TrainerHill_Entrance_Text_WhatSortOfTrainersAreAhead: @ 8268D5A
 	.string "Who knows what sort of TRAINERS\n"
 	.string "and POKéMON combos are ahead?\p"
 	.string "All I know is that I'll knock aside\n"
 	.string "anyone that stands in my way!$"
 
-TrainerHill_Entrance_Text_268DDA: @ 8268DDA
+TrainerHill_Entrance_Text_CantWaitToTestTheWaters: @ 8268DDA
 	.string "I heard tough TRAINERS come to this\n"
 	.string "TRAINER HILL from all over.\p"
 	.string "I can't wait to test the waters!\p"
 	.string "I'll knock aside anyone that stands\n"
 	.string "in my way!$"
 
-TrainerHill_Entrance_Text_268E6A: @ 8268E6A
+TrainerHill_Entrance_Text_FriendsTryingToReachTimeBoardTop: @ 8268E6A
 	.string "Do you see the Time Board over there?\p"
 	.string "My friends and I are trying to see who\n"
 	.string "can reach the top in the least time.$"
 
-TrainerHill_Entrance_Text_268EDC: @ 8268EDC
+TrainerHill_Entrance_Text_DoYouKnowWhenTheyOpen: @ 8268EDC
 	.string "Do you know when they're opening\n"
 	.string "this place up?\p"
 	.string "I'm waiting here to be the first\n"
 	.string "challenger ever!$"
 
-TrainerHill_Elevator_Text_268F3E: @ 8268F3E
+TrainerHill_Elevator_Text_ReturnToReception: @ 8268F3E
 	.string "Would you like to return to\n"
 	.string "the reception counter?$"
diff --git a/data/maps/TrainerHill_Roof/map.json b/data/maps/TrainerHill_Roof/map.json
index 8a623028e..280494788 100644
--- a/data/maps/TrainerHill_Roof/map.json
+++ b/data/maps/TrainerHill_Roof/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 1,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "TrainerHill_Roof_EventScript_268FB2",
+      "script": "TrainerHill_Roof_EventScript_Owner",
       "flag": "0"
     }
   ],
diff --git a/data/maps/TrainerHill_Roof/scripts.inc b/data/maps/TrainerHill_Roof/scripts.inc
index f7ced5d07..af4c9ea5a 100644
--- a/data/maps/TrainerHill_Roof/scripts.inc
+++ b/data/maps/TrainerHill_Roof/scripts.inc
@@ -1,70 +1,66 @@
 TrainerHill_Roof_MapScripts:: @ 8268FA7
-	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_Roof_MapScript1_2C8336
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_Roof_MapScript2_2C8381
+	map_script MAP_SCRIPT_ON_RESUME, TrainerHill_OnResume
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, TrainerHill_OnFrame
 	.byte 0
 
-TrainerHill_Roof_EventScript_268FB2:: @ 8268FB2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_12
+TrainerHill_Roof_EventScript_Owner:: @ 8268FB2
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
 	special CallTrainerHillFunction
 	lock
 	faceplayer
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_1
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_OWNER_STATE
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_268FEA
-	case 1, TrainerHill_Roof_EventScript_268FF2
-	case 2, TrainerHill_Roof_EventScript_2690A8
-
-TrainerHill_Roof_EventScript_268FEA:: @ 8268FEA
-	msgbox TrainerHill_Roof_Text_268986, MSGBOX_DEFAULT
-
-TrainerHill_Roof_EventScript_268FF2:: @ 8268FF2
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_2
+	case 0, TrainerHill_Roof_EventScript_Arrived
+	case 1, TrainerHill_Roof_EventScript_GivePrize
+	case 2, TrainerHill_Roof_EventScript_AlreadyReceivedPrize
+TrainerHill_Roof_EventScript_Arrived:: @ 8268FEA
+	msgbox TrainerHill_Roof_Text_YouFinallyCameBravo, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_GivePrize:: @ 8268FF2
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GIVE_PRIZE
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_269020
-	case 1, TrainerHill_Roof_EventScript_269037
-	case 2, TrainerHill_Roof_EventScript_269054
-
-TrainerHill_Roof_EventScript_269020:: @ 8269020
-	msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT
+	case 0, TrainerHill_Roof_EventScript_ReceivePrize
+	case 1, TrainerHill_Roof_EventScript_NoRoomForPrize
+	case 2, TrainerHill_Roof_EventScript_CheckFinalTime
+TrainerHill_Roof_EventScript_ReceivePrize:: @ 8269020
+	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
 	playfanfare MUS_FANFA1
 	message gText_ObtainedTheItem
 	waitfanfare
 	waitmessage
-	goto TrainerHill_Roof_EventScript_269054
+	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
-TrainerHill_Roof_EventScript_269037:: @ 8269037
-	msgbox TrainerHill_Roof_Text_268AC5, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_NoRoomForPrize:: @ 8269037
+	msgbox TrainerHill_Roof_Text_HaveTheMostMarvelousGift, MSGBOX_DEFAULT
 	msgbox gText_TheBagIsFull, MSGBOX_DEFAULT
-	msgbox TrainerHill_Roof_Text_268B07, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_269054
+	msgbox TrainerHill_Roof_Text_FullUpBeBackLaterForThis, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_CheckFinalTime
 
-TrainerHill_Roof_EventScript_269054:: @ 8269054
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_3
+TrainerHill_Roof_EventScript_CheckFinalTime:: @ 8269054
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CHECK_FINAL_TIME
 	special CallTrainerHillFunction
 	switch VAR_RESULT
-	case 0, TrainerHill_Roof_EventScript_269082
-	case 1, TrainerHill_Roof_EventScript_269090
-	case 2, TrainerHill_Roof_EventScript_26909E
-
-TrainerHill_Roof_EventScript_269082:: @ 8269082
-	msgbox TrainerHill_Roof_Text_268B43, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_26909E
+	case 0, TrainerHill_Roof_EventScript_NewRecord
+	case 1, TrainerHill_Roof_EventScript_NoNewRecord
+	case 2, TrainerHill_Roof_EventScript_EndSpeakToOwner
+TrainerHill_Roof_EventScript_NewRecord:: @ 8269082
+	msgbox TrainerHill_Roof_Text_GotHereMarvelouslyQuickly, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_EndSpeakToOwner
 	end
 
-TrainerHill_Roof_EventScript_269090:: @ 8269090
-	msgbox TrainerHill_Roof_Text_268C03, MSGBOX_DEFAULT
-	goto TrainerHill_Roof_EventScript_26909E
+TrainerHill_Roof_EventScript_NoNewRecord:: @ 8269090
+	msgbox TrainerHill_Roof_Text_YouWerentVeryQuick, MSGBOX_DEFAULT
+	goto TrainerHill_Roof_EventScript_EndSpeakToOwner
 	end
 
-TrainerHill_Roof_EventScript_26909E:: @ 826909E
-	msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_EndSpeakToOwner:: @ 826909E
+	msgbox TrainerHill_Roof_Text_ArriveZippierNextTime, MSGBOX_DEFAULT
 	release
 	end
 
-TrainerHill_Roof_EventScript_2690A8:: @ 82690A8
-	msgbox TrainerHill_Roof_Text_268C31, MSGBOX_DEFAULT
+TrainerHill_Roof_EventScript_AlreadyReceivedPrize:: @ 82690A8
+	msgbox TrainerHill_Roof_Text_ArriveZippierNextTime, MSGBOX_DEFAULT
 	release
 	end
 
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc
index 40b4cf658..d45b480d1 100644
--- a/data/scripts/field_poison.inc
+++ b/data/scripts/field_poison.inc
@@ -39,7 +39,7 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
 	compare VAR_RESULT, 2
 	goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_IS_IN
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE
 	special CallTrainerHillFunction
 	compare VAR_RESULT, 1
 	goto_if_eq TrainerHill_1F_EventScript_Lost
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index db6105249..805c63264 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -1,8 +1,4 @@
-TrainerHill_1F_MapScript1_2C8336: @ 82C8336
-TrainerHill_2F_MapScript1_2C8336: @ 82C8336
-TrainerHill_3F_MapScript1_2C8336: @ 82C8336
-TrainerHill_4F_MapScript1_2C8336: @ 82C8336
-TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
+TrainerHill_OnResume: @ 82C8336
 	setvar VAR_TEMP_2, 0
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER
 	special CallTrainerHillFunction
@@ -17,67 +13,64 @@ TrainerHill_Roof_MapScript1_2C8336: @ 82C8336
 	goto_if_eq TrainerHill_1F_EventScript_Lost
 	end
 
-TrainerHill_1F_MapScript2_2C8372: @ 82C8372
-TrainerHill_2F_MapScript2_2C8372: @ 82C8372
-	map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_2C837C
+TrainerHill_OnWarp: @ 82C8372
+	map_script_2 VAR_TEMP_3, 0, TrainerHill_1F_EventScript_DummyOnWarp
 	.2byte 0
 
-TrainerHill_1F_EventScript_2C837C:: @ 82C837C
+TrainerHill_1F_EventScript_DummyOnWarp:: @ 82C837C
 	setvar VAR_TEMP_3, 1
 @ forced stop
 
-TrainerHill_1F_MapScript2_2C8381: @ 82C8381
-TrainerHill_2F_MapScript2_2C8381: @ 82C8381
-TrainerHill_3F_MapScript2_2C8381: @ 82C8381
-TrainerHill_4F_MapScript2_2C8381: @ 82C8381
-TrainerHill_Roof_MapScript2_2C8381: @ 82C8381
-	map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_2C83A6
-	map_script_2 VAR_TEMP_1, 1, TrainerHill_1F_EventScript_2C83DF
+TrainerHill_OnFrame: @ 82C8381
+	map_script_2 VAR_TEMP_2, 0, TrainerHill_1F_EventScript_DummyWarpToEntranceCounter
+	map_script_2 VAR_TEMP_1, 1, TrainerHill_EventScript_WarpToEntranceCounter
 	.2byte 0
 
 EventScript_TrainerHillTimer:: @ 82C8393
 	lockall
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_7
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_TIME
 	special CallTrainerHillFunction
-	msgbox TrainerHill_Entrance_Text_268D47, MSGBOX_DEFAULT
+	msgbox TrainerHill_Entrance_Text_ChallengeTime, MSGBOX_DEFAULT
 	releaseall
 	end
 
-TrainerHill_1F_EventScript_2C83A6:: @ 82C83A6
+TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6
 	setvar VAR_TEMP_2, 1
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_9
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT
 	special CallTrainerHillFunction
-	compare VAR_RESULT, 1
-	goto_if_eq TrainerHill_1F_EventScript_2C83BF
+	compare VAR_RESULT, 1  @ VAR_RESULT always 0 here
+	goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter
 	end
 
-TrainerHill_1F_EventScript_2C83BF:: @ 82C83BF
+@ Never reached
+TrainerHill_1F_EventScript_WarpSilentToEntranceCounter:: @ 82C83BF
 	warpsilent MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
 	waitstate
 	end
 
 TrainerHill_1F_EventScript_Lost:: @ 82C83C9
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_12
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS
 	special CallTrainerHillFunction
 	setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST
 	special CallTrainerHillFunction
 	setvar VAR_TEMP_1, 1
 	end
 
-TrainerHill_1F_EventScript_2C83DF:: @ 82C83DF
-TrainerHill_Entrance_EventScript_2C83DF:: @ 82C83DF
+TrainerHill_EventScript_WarpToEntranceCounter:: @ 82C83DF
 	setvar VAR_TEMP_1, 0
 	warp MAP_TRAINER_HILL_ENTRANCE, 255, 9, 6
 	waitstate
 	end
 
-TrainerHill_1F_Movement_2C83EE:: @ 82C83EE
+@ Unused
+TrainerHill_1F_Movement_SetInvisible:: @ 82C83EE
 	set_invisible
 	step_end
 
-EventScript_2C83F0:: @ 82C83F0
-	trainerbattle TRAINER_BATTLE_12, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
-	setvar VAR_0x8004, TRAINER_HILL_FUNC_11
+@ TRAINER_PHILLIP is an actual Trainer on the SS Tidal, but is used as a placeholder here
+TrainerHill_EventScript_TrainerBattle:: @ 82C83F0
+	trainerbattle TRAINER_BATTLE_HILL, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText
+	setvar VAR_0x8004, TRAINER_HILL_FUNC_POST_BATTLE_TEXT
 	special CallTrainerHillFunction
 	waitmessage
 	waitbuttonpress