Document Trick House scripts

25 files changed, 1278 insertions, 1272 deletions

diff --git a/data/maps/Route110_TrickHouseCorridor/scripts.inc b/data/maps/Route110_TrickHouseCorridor/scripts.inc
index 80a6ac3dd..ad469bc48 100644
--- a/data/maps/Route110_TrickHouseCorridor/scripts.inc
+++ b/data/maps/Route110_TrickHouseCorridor/scripts.inc
@@ -3,6 +3,6 @@ Route110_TrickHouseCorridor_MapScripts:: @ 826B903
 	.byte 0
 
 Route110_TrickHouseCorridor_OnTransition: @ 826B909
-	setvar VAR_TRICK_HOUSE_STATE, 1
+	setvar VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 1
 	end
 
diff --git a/data/maps/Route110_TrickHouseEnd/map.json b/data/maps/Route110_TrickHouseEnd/map.json
index 62548fe8b..84233313b 100644
--- a/data/maps/Route110_TrickHouseEnd/map.json
+++ b/data/maps/Route110_TrickHouseEnd/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHouseEnd_EventScript_26AD17",
+      "script": "Route110_TrickHouseEnd_EventScript_TrickMaster",
       "flag": "FLAG_HIDE_TRICK_HOUSE_END_MAN"
     }
   ],
@@ -52,7 +52,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHouseEnd_EventScript_26B041"
+      "script": "Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger"
     }
   ],
   "bg_events": [
diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 46c4c316e..348fce566 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -1,13 +1,13 @@
 Route110_TrickHouseEnd_MapScripts:: @ 826ACAF
-	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_MapScript1_26ACC4
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHouseEnd_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEnd_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_MapScript2_26ACF5
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_MapScript2_26ACDE
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEnd_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEnd_OnWarp
 	.byte 0
 
-Route110_TrickHouseEnd_MapScript1_26ACC4: @ 826ACC4
+Route110_TrickHouseEnd_OnResume: @ 826ACC4
 	compare VAR_TEMP_1, 1
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AD0D
+	call_if_eq Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile
 	end
 
 Route110_TrickHouseEnd_OnTransition: @ 826ACD0
@@ -16,306 +16,306 @@ Route110_TrickHouseEnd_OnTransition: @ 826ACD0
 	special SetTrickHouseEndRoomFlag
 	end
 
-Route110_TrickHouseEnd_MapScript2_26ACDE: @ 826ACDE
-	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_26ACE8
+Route110_TrickHouseEnd_OnWarp: @ 826ACDE
+	map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_SetTrickMasterPos
 	.2byte 0
 
-Route110_TrickHouseEnd_EventScript_26ACE8:: @ 826ACE8
+Route110_TrickHouseEnd_EventScript_SetTrickMasterPos:: @ 826ACE8
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END
 	turnobject 1, DIR_EAST
 	end
 
-Route110_TrickHouseEnd_MapScript2_26ACF5: @ 826ACF5
-	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_26ACFF
+Route110_TrickHouseEnd_OnFrame: @ 826ACF5
+	map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_CloseDoor
 	.2byte 0
 
-Route110_TrickHouseEnd_EventScript_26ACFF:: @ 826ACFF
+Route110_TrickHouseEnd_EventScript_CloseDoor:: @ 826ACFF
 	setvar VAR_TEMP_1, 1
-	call Route110_TrickHouseEnd_EventScript_26AD0D
+	call Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile
 	special DrawWholeMapView
 	end
 
-Route110_TrickHouseEnd_EventScript_26AD0D:: @ 826AD0D
+Route110_TrickHouseEnd_EventScript_SetDoorClosedMetatile:: @ 826AD0D
 	setmetatile 10, 1, METATILE_GenericBuilding_TrickHouse_Door_Closed, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26AD17:: @ 826AD17
+Route110_TrickHouseEnd_EventScript_TrickMaster:: @ 826AD17
 	lock
 	faceplayer
-	msgbox Route110_TrickHouseEnd_Text_26B08D, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouveMadeItToMe, MSGBOX_DEFAULT
 	setvar VAR_TEMP_2, 1
 	switch VAR_TRICK_HOUSE_LEVEL
-	case 0, Route110_TrickHouseEnd_EventScript_26AD84
-	case 1, Route110_TrickHouseEnd_EventScript_26ADC0
-	case 2, Route110_TrickHouseEnd_EventScript_26ADFC
-	case 3, Route110_TrickHouseEnd_EventScript_26AE38
-	case 4, Route110_TrickHouseEnd_EventScript_26AE74
-	case 5, Route110_TrickHouseEnd_EventScript_26AEB0
-	case 6, Route110_TrickHouseEnd_EventScript_26AEEC
-	case 7, Route110_TrickHouseEnd_EventScript_26AF28
+	case 0, Route110_TrickHouseEnd_EventScript_CompletedPuzzle1
+	case 1, Route110_TrickHouseEnd_EventScript_CompletedPuzzle2
+	case 2, Route110_TrickHouseEnd_EventScript_CompletedPuzzle3
+	case 3, Route110_TrickHouseEnd_EventScript_CompletedPuzzle4
+	case 4, Route110_TrickHouseEnd_EventScript_CompletedPuzzle5
+	case 5, Route110_TrickHouseEnd_EventScript_CompletedPuzzle6
+	case 6, Route110_TrickHouseEnd_EventScript_CompletedPuzzle7
+	case 7, Route110_TrickHouseEnd_EventScript_CompletedPuzzle8
 	end
 
-Route110_TrickHouseEnd_EventScript_26AD84:: @ 826AD84
-	msgbox Route110_TrickHouseEnd_Text_26B0BC, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle1:: @ 826AD84
+	msgbox Route110_TrickHouseEnd_Text_AllNightToPlantTrees, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_RARE_CANDY
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26ADC0:: @ 826ADC0
-	msgbox Route110_TrickHouseEnd_Text_26B13B, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle2:: @ 826ADC0
+	msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMaze, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TIMER_BALL
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26ADFC:: @ 826ADFC
-	msgbox Route110_TrickHouseEnd_Text_26B1AD, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle3:: @ 826ADFC
+	msgbox Route110_TrickHouseEnd_Text_AllNightToPreparePanels, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_HARD_STONE
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AE38:: @ 826AE38
-	msgbox Route110_TrickHouseEnd_Text_26B223, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle4:: @ 826AE38
+	msgbox Route110_TrickHouseEnd_Text_AllNightToShoveBoulders, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_SMOKE_BALL
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AE74:: @ 826AE74
-	msgbox Route110_TrickHouseEnd_Text_26B293, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle5:: @ 826AE74
+	msgbox Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_TM12
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AEB0:: @ 826AEB0
-	msgbox Route110_TrickHouseEnd_Text_26B315, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle6:: @ 826AEB0
+	msgbox Route110_TrickHouseEnd_Text_AllNightToInstallDoors, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_MAGNET
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AEEC:: @ 826AEEC
-	msgbox Route110_TrickHouseEnd_Text_26B365, MSGBOX_DEFAULT
-	msgbox Route110_TrickHouseEnd_Text_26B73D, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle7:: @ 826AEEC
+	msgbox Route110_TrickHouseEnd_Text_AllNightSettingUpArrows, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
 	giveitem_std ITEM_PP_MAX
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26AFEF
-	msgbox Route110_TrickHouseEnd_Text_26B7EF, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_BagFull
+	msgbox Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou, MSGBOX_DEFAULT
 	closemessage
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AF28:: @ 826AF28
-	msgbox Route110_TrickHouseEnd_Text_26B3AB, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_CompletedPuzzle8:: @ 826AF28
+	msgbox Route110_TrickHouseEnd_Text_AllNightPolishingFloors, MSGBOX_DEFAULT
 	closemessage
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B015
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B020
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth
 	compare VAR_FACING, DIR_WEST
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B02B
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B036
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast
 	delay 30
-	msgbox Route110_TrickHouseEnd_Text_26B3FA, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	delay 30
-	msgbox Route110_TrickHouseEnd_Text_26B485, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	call Route110_TrickHouseEnd_EventScript_26AFA5
-	compare VAR_RESULT, 0
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B002
-	msgbox Route110_TrickHouseEnd_Text_26B69A, MSGBOX_DEFAULT
-	call Route110_TrickHouseEnd_EventScript_26AFCF
+	call Route110_TrickHouseEnd_EventScript_ChooseTent
+	compare VAR_RESULT, FALSE
+	call_if_eq Route110_TrickHouseEnd_EventScript_NoRoomForTent
+	msgbox Route110_TrickHouseEnd_Text_LeavingOnJourney, MSGBOX_DEFAULT
+	call Route110_TrickHouseEnd_EventScript_TrickMasterExit
 	special ResetTrickHouseEndRoomFlag
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5
+Route110_TrickHouseEnd_EventScript_ChooseTent:: @ 826AFA5
 	multichoice 0, 0, MULTI_TENT, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHouseEnd_EventScript_26AFBF
-	goto Route110_TrickHouseEnd_EventScript_26AFC7
+	case 0, Route110_TrickHouseEnd_EventScript_GiveRedTent
+	goto Route110_TrickHouseEnd_EventScript_GiveBlueTent
 
-Route110_TrickHouseEnd_EventScript_26AFBF:: @ 826AFBF
+Route110_TrickHouseEnd_EventScript_GiveRedTent:: @ 826AFBF
 	givedecoration_std DECOR_RED_TENT
 	return
 
-Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7
+Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7
 	givedecoration_std DECOR_BLUE_TENT
 	return
 
-Route110_TrickHouseEnd_EventScript_26AFCF:: @ 826AFCF
-	applymovement 1, Route110_TrickHouseEnd_Movement_269E36
+Route110_TrickHouseEnd_EventScript_TrickMasterExit:: @ 826AFCF
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
 	playse SE_W153
-	applymovement 1, Route110_TrickHouseEnd_Movement_269E3F
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject 1
 	addvar VAR_TRICK_HOUSE_LEVEL, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26AFEF:: @ 826AFEF
+Route110_TrickHouseEnd_EventScript_BagFull:: @ 826AFEF
 	call Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEnd_Text_26B760, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_NoRoomForThis, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26B002:: @ 826B002
+Route110_TrickHouseEnd_EventScript_NoRoomForTent:: @ 826B002
 	call Common_EventScript_NoRoomLeftForAnother
-	msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_NoRoomInPC, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth:: @ 826B015
 	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth:: @ 826B020
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest:: @ 826B02B
 	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayEast:: @ 826B036
 	applymovement 1, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B041:: @ 826B041
+Route110_TrickHouseEnd_EventScript_TrickMasterExitTrigger:: @ 826B041
 	lockall
 	turnobject 1, DIR_WEST
 	playse SE_PIN
 	applymovement 1, Common_Movement_ExclamationMark
 	waitmovement 0
 	delay 20
-	applymovement 1, Route110_TrickHouseEnd_Movement_26B08B
+	applymovement 1, Route110_TrickHouseEnd_Movement_TrickMasterSurprise
 	waitmovement 0
 	playse SE_W153
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
-	msgbox Route110_TrickHouseEnd_Text_26B8BD, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEnd_Text_YoureIgnoringMe, MSGBOX_DEFAULT
 	closemessage
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_26B089
+	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEnd_Movement_KeepPlayerInRoom
 	waitmovement 0
 	delay 4
 	turnobject 1, DIR_EAST
 	releaseall
 	end
 
-Route110_TrickHouseEnd_Movement_26B089: @ 826B089
+Route110_TrickHouseEnd_Movement_KeepPlayerInRoom: @ 826B089
 	walk_down
 	step_end
 
-Route110_TrickHouseEnd_Movement_26B08B: @ 826B08B
+Route110_TrickHouseEnd_Movement_TrickMasterSurprise: @ 826B08B
 	jump_in_place_left
 	step_end
 
-Route110_TrickHouseEnd_Text_26B08D: @ 826B08D
+Route110_TrickHouseEnd_Text_YouveMadeItToMe: @ 826B08D
 	.string "Aak!\n"
 	.string "You've made it to me?\l"
 	.string "Hmmm… You're sharp!$"
 
-Route110_TrickHouseEnd_Text_26B0BC: @ 826B0BC
+Route110_TrickHouseEnd_Text_AllNightToPlantTrees: @ 826B0BC
 	.string "It took me all night to plant all those\n"
 	.string "trees…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four, five, six places!$"
 
-Route110_TrickHouseEnd_Text_26B13B: @ 826B13B
+Route110_TrickHouseEnd_Text_AllNightToMakeMaze: @ 826B13B
 	.string "It took me all night to make the maze…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four, five places!$"
 
-Route110_TrickHouseEnd_Text_26B1AD: @ 826B1AD
+Route110_TrickHouseEnd_Text_AllNightToPreparePanels: @ 826B1AD
 	.string "It took me all night to prepare\n"
 	.string "the wall panels…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three, four places!$"
 
-Route110_TrickHouseEnd_Text_26B223: @ 826B223
+Route110_TrickHouseEnd_Text_AllNightToShoveBoulders: @ 826B223
 	.string "It took me all night to shove in those\n"
 	.string "boulders…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two, three places!$"
 
-Route110_TrickHouseEnd_Text_26B293: @ 826B293
+Route110_TrickHouseEnd_Text_AllNightToMakeMechadolls: @ 826B293
 	.string "It took me all night to make MECHADOLLS\n"
 	.string "and another to think up the quiz…\p"
 	.string "You're almost my equal in greatness by\n"
 	.string "one, two places!$"
 
-Route110_TrickHouseEnd_Text_26B315: @ 826B315
+Route110_TrickHouseEnd_Text_AllNightToInstallDoors: @ 826B315
 	.string "It took me all night to install\n"
 	.string "the doors…\p"
 	.string "You're almost my equal in greatness!$"
 
-Route110_TrickHouseEnd_Text_26B365: @ 826B365
+Route110_TrickHouseEnd_Text_AllNightSettingUpArrows: @ 826B365
 	.string "It took me all night setting up arrows…\p"
 	.string "You're my equal in greatness!$"
 
-Route110_TrickHouseEnd_Text_26B3AB: @ 826B3AB
+Route110_TrickHouseEnd_Text_AllNightPolishingFloors: @ 826B3AB
 	.string "It took me all night polishing floors…\p"
 	.string "You're above me in greatness!\n"
 	.string "Possibly…$"
 
-Route110_TrickHouseEnd_Text_26B3FA: @ 826B3FA
+Route110_TrickHouseEnd_Text_FountainOfIdeasRunDry: @ 826B3FA
 	.string "Wh-what should I do?\n"
 	.string "My fountain of ideas for tricks has\l"
 	.string "run dry…\p"
 	.string "Perhaps it is time I toured the country\n"
 	.string "on a quest to devise new tricks…$"
 
-Route110_TrickHouseEnd_Text_26B485: @ 826B485
+Route110_TrickHouseEnd_Text_DefeatedMePreferWhichTent: @ 826B485
 	.string "I hate to admit defeat, but you have\n"
 	.string "bested me!\p"
 	.string "Still, you must have been reeled in by\n"
@@ -331,13 +331,13 @@ Route110_TrickHouseEnd_Text_26B485: @ 826B485
 	.string "a RED TENT and a BLUE TENT.\l"
 	.string "Which do you prefer?$"
 
-Route110_TrickHouseEnd_Text_26B615: @ 826B615
+Route110_TrickHouseEnd_Text_NoRoomInPC: @ 826B615
 	.string "What? No room in your PC?\n"
 	.string "What am I to make of that?\p"
 	.string "I wish I could say that, but I am much\n"
 	.string "too kind and caring, so come back later!$"
 
-Route110_TrickHouseEnd_Text_26B69A: @ 826B69A
+Route110_TrickHouseEnd_Text_LeavingOnJourney: @ 826B69A
 	.string "… … … … … …\p"
 	.string "I am leaving on a journey of discovery.\n"
 	.string "A quest in search of new tricks.\p"
@@ -345,17 +345,17 @@ Route110_TrickHouseEnd_Text_26B69A: @ 826B69A
 	.string "entertain me again.\p"
 	.string "And now, farewell!$"
 
-Route110_TrickHouseEnd_Text_26B73D: @ 826B73D
+Route110_TrickHouseEnd_Text_YouHaveEarnedThisReward: @ 826B73D
 	.string "Fine!\n"
 	.string "You have earned this reward!$"
 
-Route110_TrickHouseEnd_Text_26B760: @ 826B760
+Route110_TrickHouseEnd_Text_NoRoomForThis: @ 826B760
 	.string "What? Have you no room for this?\n"
 	.string "What manner of items do you carry?\p"
 	.string "But fine, since you've reached me,\n"
 	.string "your reward will be with me till later.$"
 
-Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF
+Route110_TrickHouseEnd_Text_MakeNewTricksToStumpYou: @ 826B7EF
 	.string "Scrub that smug smirk from your face!\n"
 	.string "It's much too early to think you've won!\p"
 	.string "I'll make new tricks to stump you, I will.\n"
@@ -363,7 +363,7 @@ Route110_TrickHouseEnd_Text_26B7EF: @ 826B7EF
 	.string "Come back for the next exciting\n"
 	.string "installment!$"
 
-Route110_TrickHouseEnd_Text_26B8BD: @ 826B8BD
+Route110_TrickHouseEnd_Text_YoureIgnoringMe: @ 826B8BD
 	.string "Now, now! You're ignoring me now?\n"
 	.string "Now that, I consider heartbreaking!$"
 
diff --git a/data/maps/Route110_TrickHouseEntrance/map.json b/data/maps/Route110_TrickHouseEntrance/map.json
index ce188feec..58ba81aea 100644
--- a/data/maps/Route110_TrickHouseEntrance/map.json
+++ b/data/maps/Route110_TrickHouseEntrance/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_269D3B",
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMaster",
       "flag": "FLAG_HIDE_TRICK_HOUSE_ENTRANCE_MAN"
     }
   ],
@@ -57,36 +57,36 @@
       "x": 4,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE",
       "var_value": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding"
     },
     {
       "type": "trigger",
       "x": 5,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE",
       "var_value": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding"
     },
     {
       "type": "trigger",
       "x": 6,
       "y": 6,
       "elevation": 3,
-      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE",
       "var_value": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding"
     },
     {
       "type": "trigger",
       "x": 7,
       "y": 7,
       "elevation": 3,
-      "var": "VAR_TRICK_HOUSE_ENTRANCE_STATE_1",
+      "var": "VAR_TRICK_HOUSE_BEING_WATCHED_STATE",
       "var_value": "0",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A3F8"
+      "script": "Route110_TrickHouseEntrance_EventScript_TrickMasterHiding"
     }
   ],
   "bg_events": [
@@ -96,7 +96,7 @@
       "y": 1,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_NORTH",
-      "script": "Route110_TrickHouseEntrance_EventScript_26A0D3"
+      "script": "Route110_TrickHouseEntrance_EventScript_Door"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHouseEntrance/scripts.inc b/data/maps/Route110_TrickHouseEntrance/scripts.inc
index ab3ef25aa..eaf3defd8 100644
--- a/data/maps/Route110_TrickHouseEntrance/scripts.inc
+++ b/data/maps/Route110_TrickHouseEntrance/scripts.inc
@@ -1,302 +1,310 @@
 Route110_TrickHouseEntrance_MapScripts:: @ 8269A50
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHouseEntrance_OnTransition
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_MapScript2_269CEE
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_MapScript2_269BD3
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHouseEntrance_OnFrame
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHouseEntrance_OnWarp
 	.byte 0
 
+	@ State descriptions for VAR_TRICK_HOUSE_ENTRANCE_STATE
+	@ 0: Trick Master is hiding
+	@ 1: Trick Master has left at start of challenge
+	@ 2: Trick Master ready to give normal reward from previous challenge (if bag was full)
+	@ 3: Trick Master still making next puzzle
+	@ 4: Finished final puzzle
+	@ 5: Completed previous challenge
+	@ 6: 'Trick Master' mechadoll ready to give Tent reward from final challenge (if bag was full)
+
 Route110_TrickHouseEntrance_OnTransition: @ 8269A60
 	setflag FLAG_LANDMARK_TRICK_HOUSE
-	compare VAR_TRICK_HOUSE_STATE, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AF3
+	compare VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterFromCorridor
 	compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AD7
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269BB3
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B03
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_269BBB
-	case 1, Route110_TrickHouseEntrance_EventScript_269BC1
-	case 3, Route110_TrickHouseEntrance_EventScript_269BC7
-	case 4, Route110_TrickHouseEntrance_EventScript_269BCD
-	end
-
-Route110_TrickHouseEntrance_EventScript_269AD7:: @ 8269AD7
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward
+	compare VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 5
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle
+	compare VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE
+	case 0, Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger
+	case 1, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1
+	case 3, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2
+	case 4, Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3
+	end
+
+Route110_TrickHouseEntrance_EventScript_SetReadyToGiveReward:: @ 8269AD7
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	compare VAR_TRICK_HOUSE_LEVEL, 8
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269AED
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 2
 	end
 
-Route110_TrickHouseEntrance_EventScript_269AED:: @ 8269AED
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6
+Route110_TrickHouseEntrance_EventScript_ReadyToGiveTentReward:: @ 8269AED
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 6
 	end
 
-Route110_TrickHouseEntrance_EventScript_269AF3:: @ 8269AF3
-	setvar VAR_TRICK_HOUSE_STATE, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+Route110_TrickHouseEntrance_EventScript_EnterFromCorridor:: @ 8269AF3
+	setvar VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 5
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269B03:: @ 8269B03
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0
+Route110_TrickHouseEntrance_EventScript_CheckReadyForNextPuzzle:: @ 8269B03
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0
 	compare VAR_TRICK_HOUSE_LEVEL, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B61
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2
 	compare VAR_TRICK_HOUSE_LEVEL, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B6B
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3
 	compare VAR_TRICK_HOUSE_LEVEL, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B75
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4
 	compare VAR_TRICK_HOUSE_LEVEL, 4
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B7F
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5
 	compare VAR_TRICK_HOUSE_LEVEL, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B89
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6
 	compare VAR_TRICK_HOUSE_LEVEL, 6
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B93
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7
 	compare VAR_TRICK_HOUSE_LEVEL, 7
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269B9D
+	call_if_eq Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8
 	compare VAR_TRICK_HOUSE_LEVEL, 8
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269BA7
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FinishedPuzzles
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B61:: @ 8269B61
-	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle2:: @ 8269B61
+	call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B6B:: @ 8269B6B
-	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle3:: @ 8269B6B
+	call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B75:: @ 8269B75
-	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle4:: @ 8269B75
+	call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B7F:: @ 8269B7F
-	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle5:: @ 8269B7F
+	call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B89:: @ 8269B89
-	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle6:: @ 8269B89
+	call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B93:: @ 8269B93
-	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle7:: @ 8269B93
+	call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269B9D:: @ 8269B9D
-	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_269BAD
+Route110_TrickHouseEntrance_EventScript_CheckReadyForPuzzle8:: @ 8269B9D
+	call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle
 	return
 
-Route110_TrickHouseEntrance_EventScript_269BA7:: @ 8269BA7
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4
+Route110_TrickHouseEntrance_EventScript_FinishedPuzzles:: @ 8269BA7
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 4
 	return
 
-Route110_TrickHouseEntrance_EventScript_269BAD:: @ 8269BAD
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+Route110_TrickHouseEntrance_EventScript_NotReadyForPuzzle:: @ 8269BAD
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
 	return
 
-Route110_TrickHouseEntrance_EventScript_269BB3:: @ 8269BB3
+Route110_TrickHouseEntrance_EventScript_MoveTrickMasterToDoor:: @ 8269BB3
 	setobjectxyperm 1, 5, 2
 	end
 
-Route110_TrickHouseEntrance_EventScript_269BBB:: @ 8269BBB
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 0
+Route110_TrickHouseEntrance_EventScript_ReadyBeingWatchedTrigger:: @ 8269BBB
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 0
 	end
 
-Route110_TrickHouseEntrance_EventScript_269BC1:: @ 8269BC1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched1:: @ 8269BC1
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269BC7:: @ 8269BC7
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched2:: @ 8269BC7
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269BCD:: @ 8269BCD
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+Route110_TrickHouseEntrance_EventScript_SetNotBeingWatched3:: @ 8269BCD
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_MapScript2_269BD3: @ 8269BD3
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269C15
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_269C26
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_269CD0
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_269CCC
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_269CDF
+Route110_TrickHouseEntrance_OnWarp: @ 8269BD3
+	map_script_2 VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1, Route110_TrickHouseEntrance_EventScript_TrickMasterFound
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 0, Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 1, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 2, Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 3, Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 4, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 5, Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster
+	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE, 6, Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor
 	.2byte 0
 
-Route110_TrickHouseEntrance_EventScript_269C15:: @ 8269C15
+Route110_TrickHouseEntrance_EventScript_TrickMasterFound:: @ 8269C15
 	addobject 1
 	showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	turnobject 1, DIR_EAST
 	turnobject EVENT_OBJ_ID_PLAYER, DIR_WEST
 	end
 
-Route110_TrickHouseEntrance_EventScript_269C26:: @ 8269C26
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterHidingSpot:: @ 8269C26
 	addobject 1
 	hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE
 	switch VAR_TRICK_HOUSE_LEVEL
-	case 0, Route110_TrickHouseEntrance_EventScript_269C8C
-	case 1, Route110_TrickHouseEntrance_EventScript_269C94
-	case 2, Route110_TrickHouseEntrance_EventScript_269C9C
-	case 3, Route110_TrickHouseEntrance_EventScript_269CA4
-	case 4, Route110_TrickHouseEntrance_EventScript_269CAC
-	case 5, Route110_TrickHouseEntrance_EventScript_269CB4
-	case 6, Route110_TrickHouseEntrance_EventScript_269CBC
-	case 7, Route110_TrickHouseEntrance_EventScript_269CC4
+	case 0, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1
+	case 1, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2
+	case 2, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3
+	case 3, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4
+	case 4, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5
+	case 5, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6
+	case 6, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7
+	case 7, Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8
 	end
 
-Route110_TrickHouseEntrance_EventScript_269C8C:: @ 8269C8C
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle1:: @ 8269C8C
 	setobjectxy 1, 6, 3
 	end
 
-Route110_TrickHouseEntrance_EventScript_269C94:: @ 8269C94
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle2:: @ 8269C94
 	setobjectxy 1, 11, 5
 	end
 
-Route110_TrickHouseEntrance_EventScript_269C9C:: @ 8269C9C
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle3:: @ 8269C9C
 	setobjectxy 1, 9, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CA4:: @ 8269CA4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle4:: @ 8269CA4
 	setobjectxy 1, 3, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CAC:: @ 8269CAC
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle5:: @ 8269CAC
 	setobjectxy 1, 0, 5
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CB4:: @ 8269CB4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle6:: @ 8269CB4
 	setobjectxy 1, 11, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CBC:: @ 8269CBC
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle7:: @ 8269CBC
 	setobjectxy 1, 8, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CC4:: @ 8269CC4
+Route110_TrickHouseEntrance_EventScript_SetHidingSpotPuzzle8:: @ 8269CC4
 	setobjectxy 1, 4, 4
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CCC:: @ 8269CCC
+Route110_TrickHouseEntrance_EventScript_RemoveTrickMaster:: @ 8269CCC
 	removeobject 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CD0:: @ 8269CD0
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterFacingDoor:: @ 8269CD0
 	addobject 1
 	setobjectxy 1, 5, 2
 	turnobject 1, DIR_NORTH
 	end
 
-Route110_TrickHouseEntrance_EventScript_269CDF:: @ 8269CDF
+Route110_TrickHouseEntrance_EventScript_SetTrickMasterInFrontOfDoor:: @ 8269CDF
 	addobject 1
 	setobjectxy 1, 5, 2
 	turnobject 1, DIR_SOUTH
 	end
 
-Route110_TrickHouseEntrance_MapScript2_269CEE: @ 8269CEE
-	map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_269CF8
+Route110_TrickHouseEntrance_OnFrame: @ 8269CEE
+	map_script_2 VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1, Route110_TrickHouseEntrance_EventScript_BeginChallenge
 	.2byte 0
 
-Route110_TrickHouseEntrance_EventScript_269CF8:: @ 8269CF8
+Route110_TrickHouseEntrance_EventScript_BeginChallenge:: @ 8269CF8
 	lockall
 	delay 20
 	compare VAR_TRICK_HOUSE_LEVEL, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E48
-	msgbox Route110_TrickHouseEntrance_Text_26A78C, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHouseEntrance_EventScript_MeetTrickMaster
+	msgbox Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
 	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject 1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1
+	setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 0
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269D39:: @ 8269D39
+Route110_TrickHouseEntrance_EventScript_UnusedRelease:: @ 8269D39
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269D3B:: @ 8269D3B
+Route110_TrickHouseEntrance_EventScript_TrickMaster:: @ 8269D3B
 	lockall
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_269D6E
-	case 2, Route110_TrickHouseEntrance_EventScript_269E8F
-	case 3, Route110_TrickHouseEntrance_EventScript_269E51
-	case 6, Route110_TrickHouseEntrance_EventScript_26A039
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE
+	case 0, Route110_TrickHouseEntrance_EventScript_FoundTrickMaster
+	case 2, Route110_TrickHouseEntrance_EventScript_GiveReward
+	case 3, Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle
+	case 6, Route110_TrickHouseEntrance_EventScript_MechadollReward
 	end
 
-Route110_TrickHouseEntrance_EventScript_269D6E:: @ 8269D6E
+Route110_TrickHouseEntrance_EventScript_FoundTrickMaster:: @ 8269D6E
 	playse SE_PIN
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TRICK_HOUSE_LEVEL, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269DEE
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk
 	compare VAR_TRICK_HOUSE_LEVEL, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269DF7
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBehindTree
 	compare VAR_TRICK_HOUSE_LEVEL, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E00
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInDresser
 	compare VAR_TRICK_HOUSE_LEVEL, 3
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E09
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow
 	compare VAR_TRICK_HOUSE_LEVEL, 4
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E12
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInPlanter
 	compare VAR_TRICK_HOUSE_LEVEL, 5
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E1B
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundInCupboard
 	compare VAR_TRICK_HOUSE_LEVEL, 6
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E24
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBehindWindow
 	compare VAR_TRICK_HOUSE_LEVEL, 7
-	call_if_eq Route110_TrickHouseEntrance_EventScript_269E2D
+	call_if_eq Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion
 	closemessage
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1
+	setvar VAR_TRICK_HOUSE_FOUND_TRICK_MASTER, 1
 	warpsilent MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269DEE:: @ 8269DEE
-	msgbox Route110_TrickHouseEntrance_Text_26A48A, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBeneathDesk:: @ 8269DEE
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269DF7:: @ 8269DF7
-	msgbox Route110_TrickHouseEntrance_Text_26A4DA, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBehindTree:: @ 8269DF7
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindTree, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E00:: @ 8269E00
-	msgbox Route110_TrickHouseEntrance_Text_26A529, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundInDresser:: @ 8269E00
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedInDresser, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E09:: @ 8269E09
-	msgbox Route110_TrickHouseEntrance_Text_26A577, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBeyondWindow:: @ 8269E09
+	msgbox Route110_TrickHouseEntrance_Text_ConealedBeyondWindow, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E12:: @ 8269E12
-	msgbox Route110_TrickHouseEntrance_Text_26A5C8, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundInPlanter:: @ 8269E12
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedInPlanter, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E1B:: @ 8269E1B
-	msgbox Route110_TrickHouseEntrance_Text_26A616, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundInCupboard:: @ 8269E1B
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedInCupboard, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E24:: @ 8269E24
-	msgbox Route110_TrickHouseEntrance_Text_26A665, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBehindWindow:: @ 8269E24
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedBehindWindow, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E2D:: @ 8269E2D
-	msgbox Route110_TrickHouseEntrance_Text_26A6B6, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_FoundBeneathCushion:: @ 8269E2D
+	msgbox Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEnd_Movement_269E36: @ 8269E36
-Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36
+Route110_TrickHouse_Movement_TrickMasterSpin: @ 8269E36
 	face_up
 	delay_4
 	face_left
@@ -307,8 +315,7 @@ Route110_TrickHouseEntrance_Movement_269E36: @ 8269E36
 	delay_4
 	step_end
 
-Route110_TrickHouseEnd_Movement_269E3F: @ 8269E3F
-Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
+Route110_TrickHouse_Movement_TrickMasterJumpAway: @ 8269E3F
 	face_up
 	disable_anim
 	slide_up
@@ -319,12 +326,12 @@ Route110_TrickHouseEntrance_Movement_269E3F: @ 8269E3F
 	slide_up
 	step_end
 
-Route110_TrickHouseEntrance_EventScript_269E48:: @ 8269E48
-	msgbox Route110_TrickHouseEntrance_Text_26A709, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_MeetTrickMaster:: @ 8269E48
+	msgbox Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster, MSGBOX_DEFAULT
 	return
 
-Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
-	msgbox Route110_TrickHouseEntrance_Text_26A921, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_StillMakingPuzzle:: @ 8269E51
+	msgbox Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick, MSGBOX_DEFAULT
 	closemessage
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
@@ -333,280 +340,280 @@ Route110_TrickHouseEntrance_EventScript_269E51:: @ 8269E51
 	waitmovement 0
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26A9AF, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges, MSGBOX_DEFAULT
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269E8F:: @ 8269E8F
+Route110_TrickHouseEntrance_EventScript_GiveReward:: @ 8269E8F
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26AA82, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward, MSGBOX_DEFAULT
 	compare VAR_TRICK_HOUSE_LEVEL, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269EEF
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 2
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F1B
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 3
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F47
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 4
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F73
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 5
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269F9F
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 6
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269FCB
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward
 	compare VAR_TRICK_HOUSE_LEVEL, 7
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_269FF7
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward
 	end
 
-Route110_TrickHouseEntrance_EventScript_269EEF:: @ 8269EEF
+Route110_TrickHouseEntrance_EventScript_GivePuzzle1Reward:: @ 8269EEF
 	giveitem_std ITEM_RARE_CANDY
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269F1B:: @ 8269F1B
+Route110_TrickHouseEntrance_EventScript_GivePuzzle2Reward:: @ 8269F1B
 	giveitem_std ITEM_TIMER_BALL
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269F47:: @ 8269F47
+Route110_TrickHouseEntrance_EventScript_GivePuzzle3Reward:: @ 8269F47
 	giveitem_std ITEM_HARD_STONE
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269F73:: @ 8269F73
+Route110_TrickHouseEntrance_EventScript_GivePuzzle4Reward:: @ 8269F73
 	giveitem_std ITEM_SMOKE_BALL
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269F9F:: @ 8269F9F
+Route110_TrickHouseEntrance_EventScript_GivePuzzle5Reward:: @ 8269F9F
 	giveitem_std ITEM_TM12
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269FCB:: @ 8269FCB
+Route110_TrickHouseEntrance_EventScript_GivePuzzle6Reward:: @ 8269FCB
 	giveitem_std ITEM_MAGNET
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_269FF7:: @ 8269FF7
+Route110_TrickHouseEntrance_EventScript_GivePuzzle7Reward:: @ 8269FF7
 	giveitem_std ITEM_PP_MAX
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A023
-	compare VAR_RESULT, 0
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_GotReward
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_BagIsFull
-	msgbox Route110_TrickHouseEntrance_Text_26AB00, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A023:: @ 826A023
+Route110_TrickHouseEntrance_EventScript_GotReward:: @ 826A023
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 3
 	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A039:: @ 826A039
+Route110_TrickHouseEntrance_EventScript_MechadollReward:: @ 826A039
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
-	msgbox Route110_TrickHouseEntrance_Text_26AB2C, MSGBOX_DEFAULT
-	call Route110_TrickHouseEntrance_EventScript_26A070
-	compare VAR_RESULT, 1
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A09A
-	compare VAR_RESULT, 0
+	msgbox Route110_TrickHouseEntrance_Text_MechadollWhichTent, MSGBOX_DEFAULT
+	call Route110_TrickHouseEntrance_EventScript_ChooseTent
+	compare VAR_RESULT, TRUE
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_ReceivedTent
+	compare VAR_RESULT, FALSE
 	call_if_eq Common_EventScript_NoRoomLeftForAnother
-	msgbox Route110_TrickHouseEntrance_Text_26ABBD, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_PCFullAgain, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A070:: @ 826A070
+Route110_TrickHouseEntrance_EventScript_ChooseTent:: @ 826A070
 	multichoice 0, 0, MULTI_TENT, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHouseEntrance_EventScript_26A08A
-	goto Route110_TrickHouseEntrance_EventScript_26A092
+	case 0, Route110_TrickHouseEntrance_EventScript_GiveRedTent
+	goto Route110_TrickHouseEntrance_EventScript_GiveBlueTent
 
-Route110_TrickHouseEntrance_EventScript_26A08A:: @ 826A08A
+Route110_TrickHouseEntrance_EventScript_GiveRedTent:: @ 826A08A
 	givedecoration_std DECOR_RED_TENT
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A092:: @ 826A092
+Route110_TrickHouseEntrance_EventScript_GiveBlueTent:: @ 826A092
 	givedecoration_std DECOR_BLUE_TENT
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A09A:: @ 826A09A
-	msgbox Route110_TrickHouseEntrance_Text_26ABAE, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_ReceivedTent:: @ 826A09A
+	msgbox Route110_TrickHouseEntrance_Text_ThenFarewell, MSGBOX_DEFAULT
 	closemessage
-	applymovement 1, Route110_TrickHouseEntrance_Movement_26D632
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_MechadollShake
 	waitmovement 0
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E36
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterSpin
 	waitmovement 0
 	playse SE_W153
-	applymovement 1, Route110_TrickHouseEntrance_Movement_269E3F
+	applymovement 1, Route110_TrickHouse_Movement_TrickMasterJumpAway
 	waitmovement 0
 	removeobject 1
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5
+	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 5
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A0D3:: @ 826A0D3
+Route110_TrickHouseEntrance_EventScript_Door:: @ 826A0D3
 	lockall
-	switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3
-	case 0, Route110_TrickHouseEntrance_EventScript_26A106
-	case 1, Route110_TrickHouseEntrance_EventScript_26A110
-	case 4, Route110_TrickHouseEntrance_EventScript_26A201
-	case 5, Route110_TrickHouseEntrance_EventScript_26A20B
+	switch VAR_TRICK_HOUSE_ENTRANCE_STATE
+	case 0, Route110_TrickHouseEntrance_EventScript_ItsAScroll
+	case 1, Route110_TrickHouseEntrance_EventScript_GoInHolePrompt
+	case 4, Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote
+	case 5, Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A106:: @ 826A106
-	msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_ItsAScroll:: @ 826A106
+	msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A110:: @ 826A110
-	msgbox Route110_TrickHouseEntrance_Text_26A887, MSGBOX_YESNO
+Route110_TrickHouseEntrance_EventScript_GoInHolePrompt:: @ 826A110
+	msgbox Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll, MSGBOX_YESNO
 	closemessage
 	compare VAR_RESULT, YES
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A126
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A126:: @ 826A126
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom:: @ 826A126
 	setmetatile 5, 1, METATILE_GenericBuilding_TrickHouse_Stairs_Down, 0
 	special DrawWholeMapView
 	delay 20
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkUp
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_26A1A7
+	applymovement EVENT_OBJ_ID_PLAYER, Route110_TrickHouseEntrance_Movement_EnterRoom
 	waitmovement 0
 	switch VAR_TRICK_HOUSE_LEVEL
-	case 0, Route110_TrickHouseEntrance_EventScript_26A1A9
-	case 1, Route110_TrickHouseEntrance_EventScript_26A1B4
-	case 2, Route110_TrickHouseEntrance_EventScript_26A1BF
-	case 3, Route110_TrickHouseEntrance_EventScript_26A1CA
-	case 4, Route110_TrickHouseEntrance_EventScript_26A1D5
-	case 5, Route110_TrickHouseEntrance_EventScript_26A1E0
-	case 6, Route110_TrickHouseEntrance_EventScript_26A1EB
-	case 7, Route110_TrickHouseEntrance_EventScript_26A1F6
+	case 0, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1
+	case 1, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2
+	case 2, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3
+	case 3, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4
+	case 4, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5
+	case 5, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6
+	case 6, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7
+	case 7, Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8
 	end
 
-Route110_TrickHouseEntrance_Movement_26A1A7: @ 826A1A7
+Route110_TrickHouseEntrance_Movement_EnterRoom: @ 826A1A7
 	set_invisible
 	step_end
 
-Route110_TrickHouseEntrance_EventScript_26A1A9:: @ 826A1A9
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom1:: @ 826A1A9
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1B4:: @ 826A1B4
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom2:: @ 826A1B4
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1BF:: @ 826A1BF
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom3:: @ 826A1BF
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1CA:: @ 826A1CA
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom4:: @ 826A1CA
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1D5:: @ 826A1D5
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom5:: @ 826A1D5
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1E0:: @ 826A1E0
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom6:: @ 826A1E0
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1EB:: @ 826A1EB
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom7:: @ 826A1EB
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A1F6:: @ 826A1F6
+Route110_TrickHouseEntrance_EventScript_EnterPuzzleRoom8:: @ 826A1F6
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A201:: @ 826A201
-	msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote:: @ 826A201
+	msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A20B:: @ 826A20B
+Route110_TrickHouseEntrance_EventScript_CheckLevelForMessage:: @ 826A20B
 	compare VAR_TRICK_HOUSE_LEVEL, 8
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A220
-	msgbox Route110_TrickHouseEntrance_Text_26A878, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2
+	msgbox Route110_TrickHouseEntrance_Text_ItsAScroll, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A220:: @ 826A220
-	msgbox Route110_TrickHouseEntrance_Text_26A8BD, MSGBOX_DEFAULT
+Route110_TrickHouseEntrance_EventScript_LeftOnJourneyNote2:: @ 826A220
+	msgbox Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A22A:: @ 826A22A
+Route110_TrickHousePuzzle_EventScript_Door:: @ 826A22A
 	lockall
 	switch VAR_TRICK_HOUSE_LEVEL
-	case 0, Route110_TrickHouseEntrance_EventScript_26A289
-	case 1, Route110_TrickHouseEntrance_EventScript_26A2B2
-	case 2, Route110_TrickHouseEntrance_EventScript_26A2DB
-	case 3, Route110_TrickHouseEntrance_EventScript_26A304
-	case 4, Route110_TrickHouseEntrance_EventScript_26A32D
-	case 5, Route110_TrickHouseEntrance_EventScript_26A356
-	case 6, Route110_TrickHouseEntrance_EventScript_26A37F
-	case 7, Route110_TrickHouseEntrance_EventScript_26A3A8
+	case 0, Route110_TrickHousePuzzle1_EventScript_Door
+	case 1, Route110_TrickHousePuzzle2_EventScript_Door
+	case 2, Route110_TrickHousePuzzle3_EventScript_Door
+	case 3, Route110_TrickHousePuzzle4_EventScript_Door
+	case 4, Route110_TrickHousePuzzle5_EventScript_Door
+	case 5, Route110_TrickHousePuzzle6_EventScript_Door
+	case 6, Route110_TrickHousePuzzle7_EventScript_Door
+	case 7, Route110_TrickHousePuzzle8_EventScript_Door
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
+Route110_TrickHousePuzzle1_EventScript_Door:: @ 826A289
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle1_Text_26B98D, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -614,10 +621,10 @@ Route110_TrickHouseEntrance_EventScript_26A289:: @ 826A289
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
+Route110_TrickHousePuzzle2_EventScript_Door:: @ 826A2B2
 	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle2_Text_26BCBA, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -625,10 +632,10 @@ Route110_TrickHouseEntrance_EventScript_26A2B2:: @ 826A2B2
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
+Route110_TrickHousePuzzle3_EventScript_Door:: @ 826A2DB
 	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle3_Text_26C609, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -636,10 +643,10 @@ Route110_TrickHouseEntrance_EventScript_26A2DB:: @ 826A2DB
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
+Route110_TrickHousePuzzle4_EventScript_Door:: @ 826A304
 	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle4_Text_26C8C3, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -647,10 +654,10 @@ Route110_TrickHouseEntrance_EventScript_26A304:: @ 826A304
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
+Route110_TrickHousePuzzle5_EventScript_Door:: @ 826A32D
 	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle5_Text_26D660, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -658,10 +665,10 @@ Route110_TrickHouseEntrance_EventScript_26A32D:: @ 826A32D
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
+Route110_TrickHousePuzzle6_EventScript_Door:: @ 826A356
 	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle6_Text_26DE26, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -669,10 +676,10 @@ Route110_TrickHouseEntrance_EventScript_26A356:: @ 826A356
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
+Route110_TrickHousePuzzle7_EventScript_Door:: @ 826A37F
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle7_EventScript_26E413, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -680,10 +687,10 @@ Route110_TrickHouseEntrance_EventScript_26A37F:: @ 826A37F
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
+Route110_TrickHousePuzzle8_EventScript_Door:: @ 826A3A8
 	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
-	goto_if_eq Route110_TrickHouseEntrance_EventScript_26A3D1
-	msgbox Route110_TrickHousePuzzle8_EventScript_26E864, MSGBOX_DEFAULT
+	goto_if_eq Route110_TrickHousePuzzle_EventScript_DoorLocked
+	msgbox Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened, MSGBOX_DEFAULT
 	playse SE_PIN
 	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
@@ -691,70 +698,56 @@ Route110_TrickHouseEntrance_EventScript_26A3A8:: @ 826A3A8
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A3D1:: @ 826A3D1
-	msgbox Route110_TrickHouseEntrance_Text_26AC4F, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle_EventScript_DoorLocked:: @ 826A3D1
+	msgbox Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle2_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle3_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle4_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle5_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle6_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle7_EventScript_26A3DB:: @ 826A3DB
-Route110_TrickHousePuzzle8_EventScript_26A3DB:: @ 826A3DB
-	msgbox Route110_TrickHousePuzzle1_Text_26AC2F, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle_EventScript_ReadScrollAgain:: @ 826A3DB
+	msgbox Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle2_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle3_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle4_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle5_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle6_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle7_EventScript_26A3E5:: @ 826A3E5
-Route110_TrickHousePuzzle8_EventScript_26A3E5:: @ 826A3E5
+Route110_TrickHousePuzzle_EventScript_FoundScroll:: @ 826A3E5
 	playfanfare MUS_FANFA4
-	message Route110_TrickHousePuzzle1_Text_26ABE8
+	message Route110_TrickHousePuzzle_Text_FoundAScroll
 	waitfanfare
-	msgbox Route110_TrickHousePuzzle1_Text_26ABFB, MSGBOX_DEFAULT
+	msgbox Route110_TrickHousePuzzle_Text_MemorizedSecretCode, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A3F8:: @ 826A3F8
+Route110_TrickHouseEntrance_EventScript_TrickMasterHiding:: @ 826A3F8
 	lockall
-	msgbox Route110_TrickHouseEntrance_Text_26A474, MSGBOX_DEFAULT
+	msgbox Route110_TrickHouseEntrance_Text_YoureBeingWatched, MSGBOX_DEFAULT
 	releaseall
 	compare VAR_TRICK_HOUSE_LEVEL, 0
-	call_if_eq Route110_TrickHouseEntrance_EventScript_26A429
+	call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1
 	compare VAR_TRICK_HOUSE_LEVEL, 1
-	call_if_eq Route110_TrickHouseEntrance_EventScript_26A439
+	call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2
 	compare VAR_TRICK_HOUSE_LEVEL, 2
-	call_if_eq Route110_TrickHouseEntrance_EventScript_26A449
-	setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_1, 1
+	call_if_eq Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3
+	setvar VAR_TRICK_HOUSE_BEING_WATCHED_STATE, 1
 	end
 
-Route110_TrickHouseEntrance_EventScript_26A429:: @ 826A429
-	setvar VAR_0x8004, 6
-	setvar VAR_0x8005, 3
-	call Route110_TrickHouseEntrance_EventScript_26A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle1:: @ 826A429
+	setvar VAR_0x8004, 6  @ x
+	setvar VAR_0x8005, 3  @ y
+	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A439:: @ 826A439
-	setvar VAR_0x8004, 11
-	setvar VAR_0x8005, 5
-	call Route110_TrickHouseEntrance_EventScript_26A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle2:: @ 826A439
+	setvar VAR_0x8004, 11  @ x
+	setvar VAR_0x8005, 5   @ y
+	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A449:: @ 826A449
-	setvar VAR_0x8004, 9
-	setvar VAR_0x8005, 2
-	call Route110_TrickHouseEntrance_EventScript_26A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle3:: @ 826A449
+	setvar VAR_0x8004, 9  @ x
+	setvar VAR_0x8005, 2  @ y
+	call Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle
 	return
 
-Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
+Route110_TrickHouseEntrance_EventScript_DoHidingSpotSparkle:: @ 826A459
 	setvar VAR_0x8006, 0
 	setfieldeffectargument 0, VAR_0x8004
 	setfieldeffectargument 1, VAR_0x8005
@@ -764,50 +757,50 @@ Route110_TrickHouseEntrance_EventScript_26A459:: @ 826A459
 	delay 10
 	return
 
-Route110_TrickHouseEntrance_Text_26A474: @ 826A474
+Route110_TrickHouseEntrance_Text_YoureBeingWatched: @ 826A474
 	.string "You're being watched…$"
 
-Route110_TrickHouseEntrance_Text_26A48A: @ 826A48A
+Route110_TrickHouseEntrance_Text_ConcealedBeneathDesk: @ 826A48A
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beneath this desk? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A4DA: @ 826A4DA
+Route110_TrickHouseEntrance_Text_ConcealedBehindTree: @ 826A4DA
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "behind this tree? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A529: @ 826A529
+Route110_TrickHouseEntrance_Text_ConcealedInDresser: @ 826A529
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this dresser? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A577: @ 826A577
+Route110_TrickHouseEntrance_Text_ConealedBeyondWindow: @ 826A577
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beyond this window? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A5C8: @ 826A5C8
+Route110_TrickHouseEntrance_Text_ConcealedInPlanter: @ 826A5C8
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this planter? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A616: @ 826A616
+Route110_TrickHouseEntrance_Text_ConcealedInCupboard: @ 826A616
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "in this cupboard? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A665: @ 826A665
+Route110_TrickHouseEntrance_Text_ConcealedBehindWindow: @ 826A665
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "behind this window? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A6B6: @ 826A6B6
+Route110_TrickHouseEntrance_Text_ConcealedBeneathCushion: @ 826A6B6
 	.string "Hah? Grrr…\p"
 	.string "How did you know I concealed myself\n"
 	.string "beneath this cushion? You're sharp!$"
 
-Route110_TrickHouseEntrance_Text_26A709: @ 826A709
+Route110_TrickHouseEntrance_Text_TheyCallMeTrickMaster: @ 826A709
 	.string "Behold!\p"
 	.string "For I am the greatest living mystery\n"
 	.string "of a man in all of HOENN!\l"
@@ -815,7 +808,7 @@ Route110_TrickHouseEntrance_Text_26A709: @ 826A709
 	.string "The TRICK MASTER!\n"
 	.string "Wahahaha! Glad to meet you!$"
 
-Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C
+Route110_TrickHouseEntrance_Text_ComeToChallengeTrickHouse: @ 826A78C
 	.string "You, you've come to challenge\n"
 	.string "my TRICK HOUSE, haven't you?\p"
 	.string "That's why you're here, isn't it?\n"
@@ -825,25 +818,25 @@ Route110_TrickHouseEntrance_Text_26A78C: @ 826A78C
 	.string "and let your challenge commence!\p"
 	.string "I shall be waiting in the back!$"
 
-Route110_TrickHouseEntrance_Text_26A878: @ 826A878
+Route110_TrickHouseEntrance_Text_ItsAScroll: @ 826A878
 	.string "It's a scroll.$"
 
-Route110_TrickHouseEntrance_Text_26A887: @ 826A887
+Route110_TrickHouseEntrance_Text_GoInHoleBehindScroll: @ 826A887
 	.string "There is a big hole behind the scroll!\p"
 	.string "Want to go in?$"
 
-Route110_TrickHouseEntrance_Text_26A8BD: @ 826A8BD
+Route110_TrickHouseEntrance_Text_LeavingOnJourneyNote: @ 826A8BD
 	.string "There is a note affixed to the scroll…\p"
 	.string "“I am leaving on a journey.\n"
 	.string "Don't look for me. TRICK MASTER”$"
 
-Route110_TrickHouseEntrance_Text_26A921: @ 826A921
+Route110_TrickHouseEntrance_Text_NextTimeUseThisTrick: @ 826A921
 	.string "For the next time, I'll use this trick,\n"
 	.string "and that scheme, and those ruses…\p"
 	.string "Mufufufu… If I may say so, it's\n"
 	.string "brilliantly difficult, even for me!$"
 
-Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF
+Route110_TrickHouseEntrance_Text_InMidstOfDevisingNewChallenges: @ 826A9AF
 	.string "Hah? What?!\n"
 	.string "Oh, it's you!\p"
 	.string "I'm in the midst of devising new tricky\n"
@@ -853,42 +846,42 @@ Route110_TrickHouseEntrance_Text_26A9AF: @ 826A9AF
 	.string "You wouldn't begrudge me that?\l"
 	.string "Come back in a little while!$"
 
-Route110_TrickHouseEntrance_Text_26AA82: @ 826AA82
+Route110_TrickHouseEntrance_Text_YoureHereToAcceptReward: @ 826AA82
 	.string "Ah, it's you! You're here to accept the\n"
 	.string "reward from before, isn't that right?\l"
 	.string "Yes, right I am!\p"
 	.string "Here!\n"
 	.string "I'll give it to you now!$"
 
-Route110_TrickHouseEntrance_Text_26AB00: @ 826AB00
+Route110_TrickHouseEntrance_Text_DidYouNotComeToClaimReward: @ 826AB00
 	.string "Hah?\n"
 	.string "Did you not come to claim your reward?$"
 
-Route110_TrickHouseEntrance_Text_26AB2C: @ 826AB2C
+Route110_TrickHouseEntrance_Text_MechadollWhichTent: @ 826AB2C
 	.string "MECHADOLL 5 I AM!\n"
 	.string "IF REWARD IS NOT TAKEN BY YOU,\l"
 	.string "THEN TRICK MASTER YOU CANNOT FOLLOW.\p"
 	.string "RED TENT OR BLUE TENT,\n"
 	.string "WHICH DO YOU PREFER?$"
 
-Route110_TrickHouseEntrance_Text_26ABAE: @ 826ABAE
+Route110_TrickHouseEntrance_Text_ThenFarewell: @ 826ABAE
 	.string "THEN FAREWELL.$"
 
-Route110_TrickHouseEntrance_Text_26ABBD: @ 826ABBD
+Route110_TrickHouseEntrance_Text_PCFullAgain: @ 826ABBD
 	.string "YOUR PC STATUS: FULL AGAIN.\n"
 	.string "MEAN, YOU ARE.$"
 
-Route110_TrickHousePuzzle1_Text_26ABE8: @ 826ABE8
+Route110_TrickHousePuzzle_Text_FoundAScroll: @ 826ABE8
 	.string "{PLAYER} found a scroll.$"
 
-Route110_TrickHousePuzzle1_Text_26ABFB: @ 826ABFB
+Route110_TrickHousePuzzle_Text_MemorizedSecretCode: @ 826ABFB
 	.string "{PLAYER} memorized the secret code\n"
 	.string "written on the scroll.$"
 
-Route110_TrickHousePuzzle1_Text_26AC2F: @ 826AC2F
+Route110_TrickHousePuzzle_Text_SecretCodeWrittenOnIt: @ 826AC2F
 	.string "A secret code is written on it.$"
 
-Route110_TrickHouseEntrance_Text_26AC4F: @ 826AC4F
+Route110_TrickHouseEntrance_Text_DoorLockedWriteSecretCodeHere: @ 826AC4F
 	.string "The door is locked.\p"
 	.string "…On closer inspection, this is written\n"
 	.string "on it: “Write the secret code here.”$"
diff --git a/data/maps/Route110_TrickHousePuzzle1/map.json b/data/maps/Route110_TrickHousePuzzle1/map.json
index 18dc10027..f656b0a48 100644
--- a/data/maps/Route110_TrickHousePuzzle1/map.json
+++ b/data/maps/Route110_TrickHousePuzzle1/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "6",
-      "script": "Route110_TrickHousePuzzle1_EventScript_26B948",
+      "script": "Route110_TrickHousePuzzle1_EventScript_Sally",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle1_EventScript_26B95F",
+      "script": "Route110_TrickHousePuzzle1_EventScript_Eddie",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle1_EventScript_26B976",
+      "script": "Route110_TrickHousePuzzle1_EventScript_Robin",
       "flag": "0"
     },
     {
@@ -241,7 +241,7 @@
       "y": 16,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle1_EventScript_26B92B"
+      "script": "Route110_TrickHousePuzzle1_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle1/scripts.inc b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
index ef81b03cf..3797ec29d 100644
--- a/data/maps/Route110_TrickHousePuzzle1/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle1/scripts.inc
@@ -1,79 +1,79 @@
 Route110_TrickHousePuzzle1_MapScripts:: @ 826B90F
-	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_MapScript1_26B915
+	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle1_OnLoad
 	.byte 0
 
-Route110_TrickHousePuzzle1_MapScript1_26B915: @ 826B915
+Route110_TrickHousePuzzle1_OnLoad: @ 826B915
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2
-	goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B921
+	goto_if_eq Route110_TrickHousePuzzle1_EventScript_OpenDoor
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B921:: @ 826B921
+Route110_TrickHousePuzzle1_EventScript_OpenDoor:: @ 826B921
 	setmetatile 13, 1, METATILE_TrickHousePuzzle_Stairs_Down, 0
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B92B:: @ 826B92B
+Route110_TrickHousePuzzle1_EventScript_Scroll:: @ 826B92B
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle1_EventScript_26B93D
-	goto Route110_TrickHousePuzzle1_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle1_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B93D:: @ 826B93D
+Route110_TrickHousePuzzle1_EventScript_FoundScroll:: @ 826B93D
 	setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1
-	goto Route110_TrickHousePuzzle1_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B948:: @ 826B948
-	trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_26B9FB, Route110_TrickHousePuzzle1_Text_26BA3F
-	msgbox Route110_TrickHousePuzzle1_Text_26BA57, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle1_EventScript_Sally:: @ 826B948
+	trainerbattle_single TRAINER_SALLY, Route110_TrickHousePuzzle1_Text_SallyIntro, Route110_TrickHousePuzzle1_Text_SallyDefeat
+	msgbox Route110_TrickHousePuzzle1_Text_SallyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B95F:: @ 826B95F
-	trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_26BA82, Route110_TrickHousePuzzle1_Text_26BAB0
-	msgbox Route110_TrickHousePuzzle1_Text_26BAC3, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle1_EventScript_Eddie:: @ 826B95F
+	trainerbattle_single TRAINER_EDDIE, Route110_TrickHousePuzzle1_Text_EddieIntro, Route110_TrickHousePuzzle1_Text_EddieDefeat
+	msgbox Route110_TrickHousePuzzle1_Text_EddiePostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_EventScript_26B976:: @ 826B976
-	trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_26BB10, Route110_TrickHousePuzzle1_Text_26BB2E
-	msgbox Route110_TrickHousePuzzle1_Text_26BB52, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle1_EventScript_Robin:: @ 826B976
+	trainerbattle_single TRAINER_ROBIN, Route110_TrickHousePuzzle1_Text_RobinIntro, Route110_TrickHousePuzzle1_Text_RobinDefeat
+	msgbox Route110_TrickHousePuzzle1_Text_RobinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle1_Text_26B98D:: @ 826B98D
+Route110_TrickHousePuzzle1_Text_WroteSecretCodeLockOpened:: @ 826B98D
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is fabulous.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle1_Text_26B9FB: @ 826B9FB
+Route110_TrickHousePuzzle1_Text_SallyIntro: @ 826B9FB
 	.string "I'll hack and slash my way to victory\n"
 	.string "with the CUT we just learned!$"
 
-Route110_TrickHousePuzzle1_Text_26BA3F: @ 826BA3F
+Route110_TrickHousePuzzle1_Text_SallyDefeat: @ 826BA3F
 	.string "Why are you so serious?$"
 
-Route110_TrickHousePuzzle1_Text_26BA57: @ 826BA57
+Route110_TrickHousePuzzle1_Text_SallyPostBattle: @ 826BA57
 	.string "I never get tired of hacking\n"
 	.string "and slashing!$"
 
-Route110_TrickHousePuzzle1_Text_26BA82: @ 826BA82
+Route110_TrickHousePuzzle1_Text_EddieIntro: @ 826BA82
 	.string "I wandered into this weird house\n"
 	.string "by accident…$"
 
-Route110_TrickHousePuzzle1_Text_26BAB0: @ 826BAB0
+Route110_TrickHousePuzzle1_Text_EddieDefeat: @ 826BAB0
 	.string "And now I've lost…$"
 
-Route110_TrickHousePuzzle1_Text_26BAC3: @ 826BAC3
+Route110_TrickHousePuzzle1_Text_EddiePostBattle: @ 826BAC3
 	.string "I lost my way, I lost a battle, and I'm\n"
 	.string "now even more lost… I can't get out…$"
 
-Route110_TrickHousePuzzle1_Text_26BB10: @ 826BB10
+Route110_TrickHousePuzzle1_Text_RobinIntro: @ 826BB10
 	.string "Just who is the TRICK MASTER?$"
 
-Route110_TrickHousePuzzle1_Text_26BB2E: @ 826BB2E
+Route110_TrickHousePuzzle1_Text_RobinDefeat: @ 826BB2E
 	.string "I lost while I was lost in thought!$"
 
-Route110_TrickHousePuzzle1_Text_26BB52: @ 826BB52
+Route110_TrickHousePuzzle1_Text_RobinPostBattle: @ 826BB52
 	.string "You're strong!\n"
 	.string "Just who are you?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle2/map.json b/data/maps/Route110_TrickHousePuzzle2/map.json
index 3a9ed637d..71b3f8916 100644
--- a/data/maps/Route110_TrickHousePuzzle2/map.json
+++ b/data/maps/Route110_TrickHousePuzzle2/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BC75",
+      "script": "Route110_TrickHousePuzzle2_EventScript_Ted",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "4",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BC8C",
+      "script": "Route110_TrickHousePuzzle2_EventScript_Paul",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BCA3",
+      "script": "Route110_TrickHousePuzzle2_EventScript_Georgia",
       "flag": "0"
     },
     {
@@ -111,7 +111,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BBDD"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Button1"
     },
     {
       "type": "trigger",
@@ -120,7 +120,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BBF0"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Button2"
     },
     {
       "type": "trigger",
@@ -129,7 +129,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BC03"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Button3"
     },
     {
       "type": "trigger",
@@ -138,7 +138,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BC16"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Button4"
     }
   ],
   "bg_events": [
@@ -148,7 +148,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle2_EventScript_26BBC0"
+      "script": "Route110_TrickHousePuzzle2_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle2/scripts.inc b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
index 334637624..2b65ca95c 100644
--- a/data/maps/Route110_TrickHousePuzzle2/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle2/scripts.inc
@@ -1,17 +1,17 @@
 Route110_TrickHousePuzzle2_MapScripts:: @ 826BB73
-	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_MapScript1_26BB7E
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle2_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle2_OnTransition
 	.byte 0
 
-Route110_TrickHousePuzzle2_MapScript1_26BB7E: @ 826BB7E
+Route110_TrickHousePuzzle2_OnResume: @ 826BB7E
 	compare VAR_TEMP_1, 1
-	call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC29
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton1
 	compare VAR_TEMP_2, 1
-	call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC3C
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton2
 	compare VAR_TEMP_3, 1
-	call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC4F
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton3
 	compare VAR_TEMP_4, 1
-	call_if_eq Route110_TrickHousePuzzle2_EventScript_26BC62
+	call_if_eq Route110_TrickHousePuzzle2_EventScript_PressButton4
 	end
 
 Route110_TrickHousePuzzle2_OnTransition: @ 826BBAB
@@ -21,126 +21,126 @@ Route110_TrickHousePuzzle2_OnTransition: @ 826BBAB
 	setvar VAR_TEMP_4, 0
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BBC0:: @ 826BBC0
+Route110_TrickHousePuzzle2_EventScript_Scroll:: @ 826BBC0
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle2_EventScript_26BBD2
-	goto Route110_TrickHousePuzzle2_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle2_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BBD2:: @ 826BBD2
+Route110_TrickHousePuzzle2_EventScript_FoundScroll:: @ 826BBD2
 	setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1
-	goto Route110_TrickHousePuzzle2_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BBDD:: @ 826BBDD
+Route110_TrickHousePuzzle2_EventScript_Button1:: @ 826BBDD
 	lockall
 	setvar VAR_TEMP_1, 1
 	playse SE_PIN
-	call Route110_TrickHousePuzzle2_EventScript_26BC29
+	call Route110_TrickHousePuzzle2_EventScript_PressButton1
 	special DrawWholeMapView
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BBF0:: @ 826BBF0
+Route110_TrickHousePuzzle2_EventScript_Button2:: @ 826BBF0
 	lockall
 	setvar VAR_TEMP_2, 1
 	playse SE_PIN
-	call Route110_TrickHousePuzzle2_EventScript_26BC3C
+	call Route110_TrickHousePuzzle2_EventScript_PressButton2
 	special DrawWholeMapView
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BC03:: @ 826BC03
+Route110_TrickHousePuzzle2_EventScript_Button3:: @ 826BC03
 	lockall
 	setvar VAR_TEMP_3, 1
 	playse SE_PIN
-	call Route110_TrickHousePuzzle2_EventScript_26BC4F
+	call Route110_TrickHousePuzzle2_EventScript_PressButton3
 	special DrawWholeMapView
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BC16:: @ 826BC16
+Route110_TrickHousePuzzle2_EventScript_Button4:: @ 826BC16
 	lockall
 	setvar VAR_TEMP_4, 1
 	playse SE_PIN
-	call Route110_TrickHousePuzzle2_EventScript_26BC62
+	call Route110_TrickHousePuzzle2_EventScript_PressButton4
 	special DrawWholeMapView
 	releaseall
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BC29:: @ 826BC29
+Route110_TrickHousePuzzle2_EventScript_PressButton1:: @ 826BC29
 	setmetatile 11, 12, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 1, 13, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_26BC3C:: @ 826BC3C
+Route110_TrickHousePuzzle2_EventScript_PressButton2:: @ 826BC3C
 	setmetatile 0, 4, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 5, 6, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_26BC4F:: @ 826BC4F
+Route110_TrickHousePuzzle2_EventScript_PressButton3:: @ 826BC4F
 	setmetatile 14, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 7, 15, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_26BC62:: @ 826BC62
+Route110_TrickHousePuzzle2_EventScript_PressButton4:: @ 826BC62
 	setmetatile 7, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	setmetatile 14, 12, METATILE_TrickHousePuzzle_Door_Shuttered, 0
 	return
 
-Route110_TrickHousePuzzle2_EventScript_26BC75:: @ 826BC75
-	trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_26BD25, Route110_TrickHousePuzzle2_Text_26BD45
-	msgbox Route110_TrickHousePuzzle2_Text_26BD70, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle2_EventScript_Ted:: @ 826BC75
+	trainerbattle_single TRAINER_TED, Route110_TrickHousePuzzle2_Text_TedIntro, Route110_TrickHousePuzzle2_Text_TedDefeat
+	msgbox Route110_TrickHousePuzzle2_Text_TedPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BC8C:: @ 826BC8C
-	trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_26BD9E, Route110_TrickHousePuzzle2_Text_26BDCF
-	msgbox Route110_TrickHousePuzzle2_Text_26BDEC, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle2_EventScript_Paul:: @ 826BC8C
+	trainerbattle_single TRAINER_PAUL, Route110_TrickHousePuzzle2_Text_PaulIntro, Route110_TrickHousePuzzle2_Text_PaulDefeat
+	msgbox Route110_TrickHousePuzzle2_Text_PaulPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_EventScript_26BCA3:: @ 826BCA3
-	trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_26BE31, Route110_TrickHousePuzzle2_Text_26BE77
-	msgbox Route110_TrickHousePuzzle2_Text_26BE97, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle2_EventScript_Georgia:: @ 826BCA3
+	trainerbattle_single TRAINER_GEORGIA, Route110_TrickHousePuzzle2_Text_GeorgiaIntro, Route110_TrickHousePuzzle2_Text_GeorgiaDefeat
+	msgbox Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle2_Text_26BCBA: @ 826BCBA
+Route110_TrickHousePuzzle2_Text_WroteSecretCodeLockOpened: @ 826BCBA
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is smart.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle2_Text_26BD25: @ 826BD25
+Route110_TrickHousePuzzle2_Text_TedIntro: @ 826BD25
 	.string "Which switch closes which hole?$"
 
-Route110_TrickHousePuzzle2_Text_26BD45: @ 826BD45
+Route110_TrickHousePuzzle2_Text_TedDefeat: @ 826BD45
 	.string "After that battle, I'm even more\n"
 	.string "confused!$"
 
-Route110_TrickHousePuzzle2_Text_26BD70: @ 826BD70
+Route110_TrickHousePuzzle2_Text_TedPostBattle: @ 826BD70
 	.string "Can I get you to push all the buttons\n"
 	.string "for me?$"
 
-Route110_TrickHousePuzzle2_Text_26BD9E: @ 826BD9E
+Route110_TrickHousePuzzle2_Text_PaulIntro: @ 826BD9E
 	.string "Oh! You're on your second TRICK HOUSE\n"
 	.string "challenge!$"
 
-Route110_TrickHousePuzzle2_Text_26BDCF: @ 826BDCF
+Route110_TrickHousePuzzle2_Text_PaulDefeat: @ 826BDCF
 	.string "You're good at battling too?$"
 
-Route110_TrickHousePuzzle2_Text_26BDEC: @ 826BDEC
+Route110_TrickHousePuzzle2_Text_PaulPostBattle: @ 826BDEC
 	.string "The TRICK MASTER rigged all the tricks\n"
 	.string "in this house all by himself.$"
 
-Route110_TrickHousePuzzle2_Text_26BE31: @ 826BE31
+Route110_TrickHousePuzzle2_Text_GeorgiaIntro: @ 826BE31
 	.string "I want to make my own GYM one day.\n"
 	.string "So, I'm studying how to set traps.$"
 
-Route110_TrickHousePuzzle2_Text_26BE77: @ 826BE77
+Route110_TrickHousePuzzle2_Text_GeorgiaDefeat: @ 826BE77
 	.string "I didn't study battling enough!$"
 
-Route110_TrickHousePuzzle2_Text_26BE97: @ 826BE97
+Route110_TrickHousePuzzle2_Text_GeorgiaPostBattle: @ 826BE97
 	.string "You're strong, aren't you?\n"
 	.string "Maybe even enough to be a GYM LEADER!$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle3/map.json b/data/maps/Route110_TrickHousePuzzle3/map.json
index a37498fd2..612edc6bf 100644
--- a/data/maps/Route110_TrickHousePuzzle3/map.json
+++ b/data/maps/Route110_TrickHousePuzzle3/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C5C4",
+      "script": "Route110_TrickHousePuzzle3_EventScript_Justin",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C5DB",
+      "script": "Route110_TrickHousePuzzle3_EventScript_Martha",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C5F2",
+      "script": "Route110_TrickHousePuzzle3_EventScript_Alan",
       "flag": "0"
     },
     {
@@ -137,7 +137,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C4CD"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Button1"
     },
     {
       "type": "trigger",
@@ -146,7 +146,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C4D9"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Button2"
     },
     {
       "type": "trigger",
@@ -155,7 +155,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C4E5"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Button3"
     },
     {
       "type": "trigger",
@@ -164,7 +164,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C4F1"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Button4"
     }
   ],
   "bg_events": [
@@ -174,7 +174,7 @@
       "y": 14,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle3_EventScript_26C5A7"
+      "script": "Route110_TrickHousePuzzle3_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle3/scripts.inc b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
index dfae2d359..ddad0d549 100644
--- a/data/maps/Route110_TrickHousePuzzle3/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle3/scripts.inc
@@ -1,14 +1,14 @@
 Route110_TrickHousePuzzle3_MapScripts:: @ 826BED8
-	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_MapScript1_26BEE3
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle3_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle3_OnTransition
 	.byte 0
 
-Route110_TrickHousePuzzle3_MapScript1_26BEE3: @ 826BEE3
-	call Route110_TrickHousePuzzle3_EventScript_26BF1E
+Route110_TrickHousePuzzle3_OnResume: @ 826BEE3
+	call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles
 	compare VAR_TEMP_9, 0
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1
 	end
 
 Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
@@ -20,38 +20,38 @@ Route110_TrickHousePuzzle3_OnTransition: @ 826BEFF
 	setvar VAR_TEMP_9, 0
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26BF1E:: @ 826BF1E
+Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles:: @ 826BF1E
 	setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Up, 0
 	setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Up, 0
 	setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Up, 0
 	setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Up, 0
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF6F
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF79
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF83
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF8D
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF6F:: @ 826BF6F
+Route110_TrickHousePuzzle3_EventScript_PressedButton1Metatile:: @ 826BF6F
 	setmetatile 4, 14, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF79:: @ 826BF79
+Route110_TrickHousePuzzle3_EventScript_PressedButton2Metatile:: @ 826BF79
 	setmetatile 3, 11, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF83:: @ 826BF83
+Route110_TrickHousePuzzle3_EventScript_PressedButton3Metatile:: @ 826BF83
 	setmetatile 12, 5, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF8D:: @ 826BF8D
+Route110_TrickHousePuzzle3_EventScript_PressedButton4Metatile:: @ 826BF8D
 	setmetatile 8, 2, METATILE_TrickHousePuzzle_Button_Pressed, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97
+Route110_TrickHousePuzzle3_EventScript_SetDoorsState0:: @ 826BF97
 	setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile0, 0
 	setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile1, 0
 	setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Open_Tile2, 0
@@ -128,7 +128,7 @@ Route110_TrickHousePuzzle3_EventScript_26BF97:: @ 826BF97
 	setmetatile 9, 5, METATILE_TrickHousePuzzle_RedDoorV_Open1, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232
+Route110_TrickHousePuzzle3_EventScript_SetDoorsState1:: @ 826C232
 	setmetatile 1, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile0, 0
 	setmetatile 2, 6, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile1, 0
 	setmetatile 1, 7, METATILE_TrickHousePuzzle_BlueDoorH_Closed_Tile2, 1
@@ -205,155 +205,155 @@ Route110_TrickHousePuzzle3_EventScript_26C232:: @ 826C232
 	setmetatile 9, 5, METATILE_TrickHousePuzzle_Floor_ShadowTop_Alt, 0
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C4CD:: @ 826C4CD
+Route110_TrickHousePuzzle3_EventScript_Button1:: @ 826C4CD
 	lockall
 	setvar VAR_TEMP_8, 1
-	goto Route110_TrickHousePuzzle3_EventScript_26C4FD
+	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C4D9:: @ 826C4D9
+Route110_TrickHousePuzzle3_EventScript_Button2:: @ 826C4D9
 	lockall
 	setvar VAR_TEMP_8, 2
-	goto Route110_TrickHousePuzzle3_EventScript_26C4FD
+	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C4E5:: @ 826C4E5
+Route110_TrickHousePuzzle3_EventScript_Button3:: @ 826C4E5
 	lockall
 	setvar VAR_TEMP_8, 3
-	goto Route110_TrickHousePuzzle3_EventScript_26C4FD
+	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C4F1:: @ 826C4F1
+Route110_TrickHousePuzzle3_EventScript_Button4:: @ 826C4F1
 	lockall
 	setvar VAR_TEMP_8, 4
-	goto Route110_TrickHousePuzzle3_EventScript_26C4FD
+	goto Route110_TrickHousePuzzle3_EventScript_PressButton
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C4FD:: @ 826C4FD
-	call Route110_TrickHousePuzzle3_EventScript_26C510
+Route110_TrickHousePuzzle3_EventScript_PressButton:: @ 826C4FD
+	call Route110_TrickHousePuzzle3_EventScript_SetButton
 	playse SE_PIN
-	call Route110_TrickHousePuzzle3_EventScript_26BF1E
-	goto Route110_TrickHousePuzzle3_EventScript_26C569
+	call Route110_TrickHousePuzzle3_EventScript_UpdateButtonMetatiles
+	goto Route110_TrickHousePuzzle3_EventScript_AlternateDoors
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C510:: @ 826C510
+Route110_TrickHousePuzzle3_EventScript_SetButton:: @ 826C510
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
 	setvar VAR_TEMP_3, 0
 	setvar VAR_TEMP_4, 0
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C551
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton1
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C557
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton2
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C55D
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton3
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C563
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetButton4
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C551:: @ 826C551
+Route110_TrickHousePuzzle3_EventScript_SetButton1:: @ 826C551
 	setvar VAR_TEMP_1, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C557:: @ 826C557
+Route110_TrickHousePuzzle3_EventScript_SetButton2:: @ 826C557
 	setvar VAR_TEMP_2, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C55D:: @ 826C55D
+Route110_TrickHousePuzzle3_EventScript_SetButton3:: @ 826C55D
 	setvar VAR_TEMP_3, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C563:: @ 826C563
+Route110_TrickHousePuzzle3_EventScript_SetButton4:: @ 826C563
 	setvar VAR_TEMP_4, 1
 	return
 
-Route110_TrickHousePuzzle3_EventScript_26C569:: @ 826C569
+Route110_TrickHousePuzzle3_EventScript_AlternateDoors:: @ 826C569
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26BF97
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState0
 	compare VAR_TEMP_9, 0
-	call_if_eq Route110_TrickHousePuzzle3_EventScript_26C232
+	call_if_eq Route110_TrickHousePuzzle3_EventScript_SetDoorsState1
 	special DrawWholeMapView
 	compare VAR_TEMP_9, 1
-	goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C599
+	goto_if_eq Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState
 	compare VAR_TEMP_9, 0
-	goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5A0
+	goto_if_eq Route110_TrickHousePuzzle3_EventScript_SetAltDoorState
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C599:: @ 826C599
+Route110_TrickHousePuzzle3_EventScript_ClearAltDoorState:: @ 826C599
 	setvar VAR_TEMP_9, 0
 	releaseall
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5A0:: @ 826C5A0
+Route110_TrickHousePuzzle3_EventScript_SetAltDoorState:: @ 826C5A0
 	setvar VAR_TEMP_9, 1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5A7:: @ 826C5A7
+Route110_TrickHousePuzzle3_EventScript_Scroll:: @ 826C5A7
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle3_EventScript_26C5B9
-	goto Route110_TrickHousePuzzle3_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle3_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5B9:: @ 826C5B9
+Route110_TrickHousePuzzle3_EventScript_FoundScroll:: @ 826C5B9
 	setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1
-	goto Route110_TrickHousePuzzle3_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5C4:: @ 826C5C4
-	trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_26C676, Route110_TrickHousePuzzle3_Text_26C69D
-	msgbox Route110_TrickHousePuzzle3_Text_26C6E6, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle3_EventScript_Justin:: @ 826C5C4
+	trainerbattle_single TRAINER_JUSTIN, Route110_TrickHousePuzzle3_Text_JustinIntro, Route110_TrickHousePuzzle3_Text_JustinDefeat
+	msgbox Route110_TrickHousePuzzle3_Text_JustinPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5DB:: @ 826C5DB
-	trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_26C726, Route110_TrickHousePuzzle3_Text_26C763
-	msgbox Route110_TrickHousePuzzle3_Text_26C776, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle3_EventScript_Martha:: @ 826C5DB
+	trainerbattle_single TRAINER_MARTHA, Route110_TrickHousePuzzle3_Text_MarthaIntro, Route110_TrickHousePuzzle3_Text_MarthaDefeat
+	msgbox Route110_TrickHousePuzzle3_Text_MarthaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_EventScript_26C5F2:: @ 826C5F2
-	trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_26C7AA, Route110_TrickHousePuzzle3_Text_26C7EC
-	msgbox Route110_TrickHousePuzzle3_Text_26C80C, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle3_EventScript_Alan:: @ 826C5F2
+	trainerbattle_single TRAINER_ALAN, Route110_TrickHousePuzzle3_Text_AlanIntro, Route110_TrickHousePuzzle3_Text_AlanDefeat
+	msgbox Route110_TrickHousePuzzle3_Text_AlanPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle3_Text_26C609: @ 826C609
+Route110_TrickHousePuzzle3_Text_WroteSecretCodeLockOpened: @ 826C609
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is coveted.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle3_Text_26C676: @ 826C676
+Route110_TrickHousePuzzle3_Text_JustinIntro: @ 826C676
 	.string "I keep coming back to this same place!$"
 
-Route110_TrickHousePuzzle3_Text_26C69D: @ 826C69D
+Route110_TrickHousePuzzle3_Text_JustinDefeat: @ 826C69D
 	.string "I'm already having trouble, and then\n"
 	.string "you have to beat me? It's not fair!$"
 
-Route110_TrickHousePuzzle3_Text_26C6E6: @ 826C6E6
+Route110_TrickHousePuzzle3_Text_JustinPostBattle: @ 826C6E6
 	.string "It's full of doors here!\n"
 	.string "It's too small and dark in here! Help!$"
 
-Route110_TrickHousePuzzle3_Text_26C726: @ 826C726
+Route110_TrickHousePuzzle3_Text_MarthaIntro: @ 826C726
 	.string "I don't know what's going on here.\n"
 	.string "I'm starting to feel sad…$"
 
-Route110_TrickHousePuzzle3_Text_26C763: @ 826C763
+Route110_TrickHousePuzzle3_Text_MarthaDefeat: @ 826C763
 	.string "You… You're awful!$"
 
-Route110_TrickHousePuzzle3_Text_26C776: @ 826C776
+Route110_TrickHousePuzzle3_Text_MarthaPostBattle: @ 826C776
 	.string "I know I'm weak!\n"
 	.string "And, I have no sense of direction!$"
 
-Route110_TrickHousePuzzle3_Text_26C7AA: @ 826C7AA
+Route110_TrickHousePuzzle3_Text_AlanIntro: @ 826C7AA
 	.string "I don't get it. What would anyone want\n"
 	.string "with a house this bizarre?$"
 
-Route110_TrickHousePuzzle3_Text_26C7EC: @ 826C7EC
+Route110_TrickHousePuzzle3_Text_AlanDefeat: @ 826C7EC
 	.string "I don't get it.\n"
 	.string "How did I lose?$"
 
-Route110_TrickHousePuzzle3_Text_26C80C: @ 826C80C
+Route110_TrickHousePuzzle3_Text_AlanPostBattle: @ 826C80C
 	.string "I don't get it.\n"
 	.string "How many traps are in this house?\p"
 	.string "You may be the one to solve that.$"
diff --git a/data/maps/Route110_TrickHousePuzzle4/map.json b/data/maps/Route110_TrickHousePuzzle4/map.json
index f77fa9b22..26a58166f 100644
--- a/data/maps/Route110_TrickHousePuzzle4/map.json
+++ b/data/maps/Route110_TrickHousePuzzle4/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle4_EventScript_26C87E",
+      "script": "Route110_TrickHousePuzzle4_EventScript_Cora",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle4_EventScript_26C8AC",
+      "script": "Route110_TrickHousePuzzle4_EventScript_Paula",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "2",
-      "script": "Route110_TrickHousePuzzle4_EventScript_26C895",
+      "script": "Route110_TrickHousePuzzle4_EventScript_Yuji",
       "flag": "0"
     },
     {
@@ -228,7 +228,7 @@
       "y": 13,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle4_EventScript_26C861"
+      "script": "Route110_TrickHousePuzzle4_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle4/scripts.inc b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
index fcb10b3ab..44610a10f 100644
--- a/data/maps/Route110_TrickHousePuzzle4/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle4/scripts.inc
@@ -1,71 +1,71 @@
 Route110_TrickHousePuzzle4_MapScripts:: @ 826C860
 	.byte 0
 
-Route110_TrickHousePuzzle4_EventScript_26C861:: @ 826C861
+Route110_TrickHousePuzzle4_EventScript_Scroll:: @ 826C861
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle4_EventScript_26C873
-	goto Route110_TrickHousePuzzle4_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle4_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle4_EventScript_26C873:: @ 826C873
+Route110_TrickHousePuzzle4_EventScript_FoundScroll:: @ 826C873
 	setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1
-	goto Route110_TrickHousePuzzle4_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle4_EventScript_26C87E:: @ 826C87E
-	trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_26C92D, Route110_TrickHousePuzzle4_Text_26C96E
-	msgbox Route110_TrickHousePuzzle4_Text_26C9A2, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle4_EventScript_Cora:: @ 826C87E
+	trainerbattle_single TRAINER_CORA, Route110_TrickHousePuzzle4_Text_CoraIntro, Route110_TrickHousePuzzle4_Text_CoraDefeat
+	msgbox Route110_TrickHousePuzzle4_Text_CoraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_EventScript_26C895:: @ 826C895
-	trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_26C9E4, Route110_TrickHousePuzzle4_Text_26CA20
-	msgbox Route110_TrickHousePuzzle4_Text_26CA53, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle4_EventScript_Yuji:: @ 826C895
+	trainerbattle_single TRAINER_YUJI, Route110_TrickHousePuzzle4_Text_YujiIntro, Route110_TrickHousePuzzle4_Text_YujiDefeat
+	msgbox Route110_TrickHousePuzzle4_Text_YujiPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_EventScript_26C8AC:: @ 826C8AC
-	trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_26CA9C, Route110_TrickHousePuzzle4_Text_26CACB
-	msgbox Route110_TrickHousePuzzle4_Text_26CAD1, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle4_EventScript_Paula:: @ 826C8AC
+	trainerbattle_single TRAINER_PAULA, Route110_TrickHousePuzzle4_Text_PaulaIntro, Route110_TrickHousePuzzle4_Text_PaulaDefeat
+	msgbox Route110_TrickHousePuzzle4_Text_PaulaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle4_Text_26C8C3: @ 826C8C3
+Route110_TrickHousePuzzle4_Text_WroteSecretCodeLockOpened: @ 826C8C3
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is cool.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle4_Text_26C92D: @ 826C92D
+Route110_TrickHousePuzzle4_Text_CoraIntro: @ 826C92D
 	.string "It's too much bother to think this out.\n"
 	.string "I only wanted to battle!$"
 
-Route110_TrickHousePuzzle4_Text_26C96E: @ 826C96E
+Route110_TrickHousePuzzle4_Text_CoraDefeat: @ 826C96E
 	.string "Even though I lost, I still like battling\n"
 	.string "the best!$"
 
-Route110_TrickHousePuzzle4_Text_26C9A2: @ 826C9A2
+Route110_TrickHousePuzzle4_Text_CoraPostBattle: @ 826C9A2
 	.string "Wouldn't you agree? You would go\n"
 	.string "anywhere if TRAINERS were there.$"
 
-Route110_TrickHousePuzzle4_Text_26C9E4: @ 826C9E4
+Route110_TrickHousePuzzle4_Text_YujiIntro: @ 826C9E4
 	.string "Heh! Boulders like this, I can brush\n"
 	.string "aside with one finger!$"
 
-Route110_TrickHousePuzzle4_Text_26CA20: @ 826CA20
+Route110_TrickHousePuzzle4_Text_YujiDefeat: @ 826CA20
 	.string "I can push boulders, but I can't solve\n"
 	.string "the puzzle…$"
 
-Route110_TrickHousePuzzle4_Text_26CA53: @ 826CA53
+Route110_TrickHousePuzzle4_Text_YujiPostBattle: @ 826CA53
 	.string "It's not good enough to be brawny…\n"
 	.string "You have to use your head. Be brainy!$"
 
-Route110_TrickHousePuzzle4_Text_26CA9C: @ 826CA9C
+Route110_TrickHousePuzzle4_Text_PaulaIntro: @ 826CA9C
 	.string "The TRICK HOUSE is getting trickier,\n"
 	.string "isn't it?$"
 
-Route110_TrickHousePuzzle4_Text_26CACB: @ 826CACB
+Route110_TrickHousePuzzle4_Text_PaulaDefeat: @ 826CACB
 	.string "Aaak!$"
 
-Route110_TrickHousePuzzle4_Text_26CAD1: @ 826CAD1
+Route110_TrickHousePuzzle4_Text_PaulaPostBattle: @ 826CAD1
 	.string "Has anyone made it to the end?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle5/map.json b/data/maps/Route110_TrickHousePuzzle5/map.json
index ae94ed240..30f4cfe47 100644
--- a/data/maps/Route110_TrickHousePuzzle5/map.json
+++ b/data/maps/Route110_TrickHousePuzzle5/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB32",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB53",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB74",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3",
       "flag": "0"
     },
     {
@@ -63,7 +63,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB95",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 0,
       "trainer_type": "0",
       "trainer_sight_or_berry_tree_id": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBB6",
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5",
       "flag": "0"
     }
   ],
@@ -111,7 +111,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBD7"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0"
     },
     {
       "type": "trigger",
@@ -120,7 +120,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBE3"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1"
     },
     {
       "type": "trigger",
@@ -129,7 +129,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBEF"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2"
     },
     {
       "type": "trigger",
@@ -138,7 +138,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CBFB"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3"
     },
     {
       "type": "trigger",
@@ -147,7 +147,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC13"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0"
     },
     {
       "type": "trigger",
@@ -156,7 +156,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC1F"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1"
     },
     {
       "type": "trigger",
@@ -165,7 +165,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC5B"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0"
     },
     {
       "type": "trigger",
@@ -174,7 +174,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC67"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1"
     },
     {
       "type": "trigger",
@@ -183,7 +183,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC73"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2"
     },
     {
       "type": "trigger",
@@ -192,7 +192,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC97"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0"
     },
     {
       "type": "trigger",
@@ -201,7 +201,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCA3"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1"
     },
     {
       "type": "trigger",
@@ -210,7 +210,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_5",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCDF"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0"
     },
     {
       "type": "trigger",
@@ -219,7 +219,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC07"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger4"
     },
     {
       "type": "trigger",
@@ -228,7 +228,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC2B"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger2"
     },
     {
       "type": "trigger",
@@ -237,7 +237,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC37"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger3"
     },
     {
       "type": "trigger",
@@ -246,7 +246,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC43"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger4"
     },
     {
       "type": "trigger",
@@ -255,7 +255,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_2",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC4F"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger5"
     },
     {
       "type": "trigger",
@@ -264,7 +264,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC7F"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger3"
     },
     {
       "type": "trigger",
@@ -273,7 +273,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_3",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CC8B"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger4"
     },
     {
       "type": "trigger",
@@ -282,7 +282,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCAF"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger2"
     },
     {
       "type": "trigger",
@@ -291,7 +291,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCBB"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger3"
     },
     {
       "type": "trigger",
@@ -300,7 +300,7 @@
       "elevation": 3,
       "var": "VAR_TEMP_4",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CCC7"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger4"
     }
   ],
   "bg_events": [
@@ -310,7 +310,7 @@
       "y": 21,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle5_EventScript_26CB15"
+      "script": "Route110_TrickHousePuzzle5_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle5/scripts.inc b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
index b678840b6..ac260981f 100644
--- a/data/maps/Route110_TrickHousePuzzle5/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle5/scripts.inc
@@ -11,207 +11,208 @@ Route110_TrickHousePuzzle5_OnTransition: @ 826CAF6
 	setvar VAR_TEMP_8, 0
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB15:: @ 826CB15
+Route110_TrickHousePuzzle5_EventScript_Scroll:: @ 826CB15
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26CB27
-	goto Route110_TrickHousePuzzle5_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB27:: @ 826CB27
+Route110_TrickHousePuzzle5_EventScript_FoundScroll:: @ 826CB27
 	setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB32:: @ 826CB32
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1:: @ 826CB32
 	lockall
 	applymovement 1, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_1, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB53:: @ 826CB53
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2:: @ 826CB53
 	lockall
 	applymovement 2, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_2, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB74:: @ 826CB74
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3:: @ 826CB74
 	lockall
 	applymovement 3, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_3, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CB95:: @ 826CB95
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4:: @ 826CB95
 	lockall
 	applymovement 4, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_4, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBB6:: @ 826CBB6
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5:: @ 826CBB6
 	lockall
 	applymovement 5, Common_Movement_FacePlayer
 	waitmovement 0
 	compare VAR_TEMP_5, 1
-	goto_if_eq Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto_if_eq Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CEF2
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBD7:: @ 826CBD7
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger0:: @ 826CBD7
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBE3:: @ 826CBE3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger1:: @ 826CBE3
 	lockall
 	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBEF:: @ 826CBEF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger2:: @ 826CBEF
 	lockall
 	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CBFB:: @ 826CBFB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger3:: @ 826CBFB
 	lockall
 	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC07:: @ 826CC07
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Trigger4:: @ 826CC07
 	lockall
 	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CCEB
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC13:: @ 826CC13
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger0:: @ 826CC13
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC1F:: @ 826CC1F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger1:: @ 826CC1F
 	lockall
 	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC2B:: @ 826CC2B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger2:: @ 826CC2B
 	lockall
 	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC37:: @ 826CC37
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger3:: @ 826CC37
 	lockall
 	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC43:: @ 826CC43
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger4:: @ 826CC43
 	lockall
 	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC4F:: @ 826CC4F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Trigger5:: @ 826CC4F
 	lockall
 	setvar VAR_TEMP_9, 5
-	goto Route110_TrickHousePuzzle5_EventScript_26CD6A
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC5B:: @ 826CC5B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger0:: @ 826CC5B
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC67:: @ 826CC67
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger1:: @ 826CC67
 	lockall
 	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC73:: @ 826CC73
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger2:: @ 826CC73
 	lockall
 	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC7F:: @ 826CC7F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger3:: @ 826CC7F
 	lockall
 	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC8B:: @ 826CC8B
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Trigger4:: @ 826CC8B
 	lockall
 	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CDF4
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CC97:: @ 826CC97
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger0:: @ 826CC97
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCA3:: @ 826CCA3
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger1:: @ 826CCA3
 	lockall
 	setvar VAR_TEMP_9, 1
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCAF:: @ 826CCAF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger2:: @ 826CCAF
 	lockall
 	setvar VAR_TEMP_9, 2
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCBB:: @ 826CCBB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger3:: @ 826CCBB
 	lockall
 	setvar VAR_TEMP_9, 3
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCC7:: @ 826CCC7
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger4:: @ 826CCC7
 	lockall
 	setvar VAR_TEMP_9, 4
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCD3:: @ 826CCD3
+@ Unused
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Trigger5:: @ 826CCD3
 	lockall
 	setvar VAR_TEMP_9, 5
-	goto Route110_TrickHousePuzzle5_EventScript_26CE73
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCDF:: @ 826CCDF
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Trigger0:: @ 826CCDF
 	lockall
 	setvar VAR_TEMP_9, 0
-	goto Route110_TrickHousePuzzle5_EventScript_26CEF2
+	goto Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Activate:: @ 826CCEB
 	setvar VAR_TEMP_1, 1
 	setvar VAR_TEMP_8, 1
 	playse SE_PIN
@@ -220,22 +221,22 @@ Route110_TrickHousePuzzle5_EventScript_26CCEB:: @ 826CCEB
 	applymovement 1, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1
 	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2
 	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3
 	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26D6CE, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26CF45
-	case 1, Route110_TrickHousePuzzle5_EventScript_26CF68
-	case 2, Route110_TrickHousePuzzle5_EventScript_26CF8B
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Activate:: @ 826CD6A
 	setvar VAR_TEMP_2, 1
 	setvar VAR_TEMP_8, 2
 	playse SE_PIN
@@ -244,24 +245,24 @@ Route110_TrickHousePuzzle5_EventScript_26CD6A:: @ 826CD6A
 	applymovement 2, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D2CC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1
 	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D304
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2
 	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D33C
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3
 	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D374
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4
 	compare VAR_TEMP_9, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3AC
-	msgbox Route110_TrickHousePuzzle5_Text_26D8EA, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26CFAE
-	case 1, Route110_TrickHousePuzzle5_EventScript_26CFD1
-	case 2, Route110_TrickHousePuzzle5_EventScript_26CFF4
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Activate:: @ 826CDF4
 	setvar VAR_TEMP_3, 1
 	setvar VAR_TEMP_8, 3
 	playse SE_PIN
@@ -270,22 +271,22 @@ Route110_TrickHousePuzzle5_EventScript_26CDF4:: @ 826CDF4
 	applymovement 3, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1
 	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2
 	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3
 	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26DA1E, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D017
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D03A
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D05D
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Activate:: @ 826CE73
 	setvar VAR_TEMP_4, 1
 	setvar VAR_TEMP_8, 4
 	playse SE_PIN
@@ -294,22 +295,22 @@ Route110_TrickHousePuzzle5_EventScript_26CE73:: @ 826CE73
 	applymovement 4, Common_Movement_Delay48
 	waitmovement 0
 	compare VAR_TEMP_9, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1B4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1
 	compare VAR_TEMP_9, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D1EC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2
 	compare VAR_TEMP_9, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D224
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3
 	compare VAR_TEMP_9, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D25C
-	msgbox Route110_TrickHousePuzzle5_Text_26DB4C, MSGBOX_DEFAULT
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D080
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D0A3
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D0C6
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Activate:: @ 826CEF2
 	setvar VAR_TEMP_5, 1
 	setvar VAR_TEMP_8, 5
 	playse SE_PIN
@@ -317,567 +318,571 @@ Route110_TrickHousePuzzle5_EventScript_26CEF2:: @ 826CEF2
 	waitmovement 0
 	applymovement 5, Common_Movement_Delay48
 	waitmovement 0
-	msgbox Route110_TrickHousePuzzle5_Text_26DC78, MSGBOX_DEFAULT
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Intro, MSGBOX_DEFAULT
 	random 3
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D0E9
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D10C
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D12F
+	case 0, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1
+	case 1, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2
+	case 2, Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CF45:: @ 826CF45
-	msgbox Route110_TrickHousePuzzle5_Text_26D757, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz1:: @ 826CF45
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q1, 1
 	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CF68:: @ 826CF68
-	msgbox Route110_TrickHousePuzzle5_Text_26D7AA, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz2:: @ 826CF68
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q2, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CF8B:: @ 826CF8B
-	msgbox Route110_TrickHousePuzzle5_Text_26D7FC, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1Quiz3:: @ 826CF8B
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL1_Q3, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CFAE:: @ 826CFAE
-	msgbox Route110_TrickHousePuzzle5_Text_26D940, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz1:: @ 826CFAE
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q1, 1
 	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CFD1:: @ 826CFD1
-	msgbox Route110_TrickHousePuzzle5_Text_26D98C, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz2:: @ 826CFD1
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q2, 1
 	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26CFF4:: @ 826CFF4
-	msgbox Route110_TrickHousePuzzle5_Text_26D9CE, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2Quiz3:: @ 826CFF4
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL2_Q3, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D017:: @ 826D017
-	msgbox Route110_TrickHousePuzzle5_Text_26DA64, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz1:: @ 826D017
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q1, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D03A:: @ 826D03A
-	msgbox Route110_TrickHousePuzzle5_Text_26DAAD, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz2:: @ 826D03A
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q2, 1
 	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D05D:: @ 826D05D
-	msgbox Route110_TrickHousePuzzle5_Text_26DAFF, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3Quiz3:: @ 826D05D
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL3_Q3, 1
 	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D080:: @ 826D080
-	msgbox Route110_TrickHousePuzzle5_Text_26DB94, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz1:: @ 826D080
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q1, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D0A3:: @ 826D0A3
-	msgbox Route110_TrickHousePuzzle5_Text_26DBD7, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz2:: @ 826D0A3
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q2, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D0C6:: @ 826D0C6
-	msgbox Route110_TrickHousePuzzle5_Text_26DC2A, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4Quiz3:: @ 826D0C6
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL4_Q3, 1
 	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D0E9:: @ 826D0E9
-	msgbox Route110_TrickHousePuzzle5_Text_26DCCB, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz1:: @ 826D0E9
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q1, 1
 	switch VAR_RESULT
-	case 1, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 1, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D10C:: @ 826D10C
-	msgbox Route110_TrickHousePuzzle5_Text_26DD1B, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz2:: @ 826D10C
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q2, 1
 	switch VAR_RESULT
-	case 0, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 0, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D12F:: @ 826D12F
-	msgbox Route110_TrickHousePuzzle5_Text_26DD5F, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5Quiz3:: @ 826D12F
+	msgbox Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3, MSGBOX_DEFAULT
 	multichoice 0, 0, MULTI_MECHADOLL5_Q3, 1
 	switch VAR_RESULT
-	case 2, Route110_TrickHousePuzzle5_EventScript_26D1A0
-	goto Route110_TrickHousePuzzle5_EventScript_26D152
+	case 2, Route110_TrickHousePuzzle5_EventScript_CorrectAnswer
+	goto Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D152:: @ 826D152
+Route110_TrickHousePuzzle5_EventScript_IncorrectAnswer:: @ 826D152
 	waitse
 	playse SE_HAZURE
-	msgbox Route110_TrickHousePuzzle5_Text_26D883, MSGBOX_DEFAULT
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D632
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D632
-	msgbox Route110_TrickHousePuzzle5_Text_26D8A1, MSGBOX_DEFAULT
-	waitmovement 0
-	msgbox Route110_TrickHousePuzzle5_Text_26D8C9, MSGBOX_DEFAULT
+	msgbox Route110_TrickHousePuzzle5_Text_DisappointmentError, MSGBOX_DEFAULT
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_MechadollShake
+	msgbox Route110_TrickHousePuzzle5_Text_Wahahahaha, MSGBOX_DEFAULT
+	waitmovement 0
+	msgbox Route110_TrickHousePuzzle5_Text_WaitForNextChallenge, MSGBOX_DEFAULT
 	closemessage
 	warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21
 	waitstate
 	releaseall
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D1A0:: @ 826D1A0
+Route110_TrickHousePuzzle5_EventScript_CorrectAnswer:: @ 826D1A0
 	waitse
 	playse SE_SEIKAI
-	goto Route110_TrickHousePuzzle5_EventScript_26D1AA
+	goto Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D1AA:: @ 826D1AA
-	msgbox Route110_TrickHousePuzzle5_Text_26D84D, MSGBOX_DEFAULT
+Route110_TrickHousePuzzle5_EventScript_CorrectGoThrough:: @ 826D1AA
+	msgbox Route110_TrickHousePuzzle5_Text_CorrectGoThrough, MSGBOX_DEFAULT
 	releaseall
 	end
 
-Route110_TrickHousePuzzle5_EventScript_26D1B4:: @ 826D1B4
+@ Absurd redundancy in movement scripts that could be resolved by using VAR_TEMP_8 for applymovement instead
+@ Many of the below movement scripts arent even used, see below
+@   Mechadoll 2 is the only mechadoll to walk right, all the other WalkRight scripts are unused
+@   Mechadoll 5 never walks, all the Mechadoll5Walk scripts are unused
+@   No mechadoll walks left 5 paces, all the WalkLeft5 scripts are unused
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft1:: @ 826D1B4
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3E4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3EF
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D3FA
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D405
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D410
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D1EC:: @ 826D1EC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft2:: @ 826D1EC
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D41B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D426
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D431
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D43C
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D447
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D224:: @ 826D224
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft3:: @ 826D224
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D452
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D45D
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D468
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D473
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D47E
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D25C:: @ 826D25C
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft4:: @ 826D25C
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D489
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D494
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D49F
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4AA
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4B5
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D294:: @ 826D294
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkLeft5:: @ 826D294
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4C0
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4CB
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4D6
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4E1
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4EC
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D2CC:: @ 826D2CC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight1:: @ 826D2CC
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D4F7
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D502
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D50D
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D518
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D523
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D304:: @ 826D304
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight2:: @ 826D304
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D52E
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D539
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D544
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D54F
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D55A
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D33C:: @ 826D33C
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight3:: @ 826D33C
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D565
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D570
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D57B
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D586
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D591
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D374:: @ 826D374
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight4:: @ 826D374
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D59C
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5A7
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5B2
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5BD
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5C8
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D3AC:: @ 826D3AC
+Route110_TrickHousePuzzle5_EventScript_MechadollWalkRight5:: @ 826D3AC
 	compare VAR_TEMP_8, 1
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5D3
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5
 	compare VAR_TEMP_8, 2
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5DE
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5
 	compare VAR_TEMP_8, 3
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5E9
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5
 	compare VAR_TEMP_8, 4
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5F4
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5
 	compare VAR_TEMP_8, 5
-	call_if_eq Route110_TrickHousePuzzle5_EventScript_26D5FF
+	call_if_eq Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D3E4:: @ 826D3E4
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft1:: @ 826D3E4
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D3EF:: @ 826D3EF
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft1:: @ 826D3EF
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D3FA:: @ 826D3FA
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft1:: @ 826D3FA
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D405:: @ 826D405
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft1:: @ 826D405
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D410:: @ 826D410
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60A
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft1:: @ 826D410
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D41B:: @ 826D41B
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft2:: @ 826D41B
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D426:: @ 826D426
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft2:: @ 826D426
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D431:: @ 826D431
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft2:: @ 826D431
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D43C:: @ 826D43C
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft2:: @ 826D43C
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D447:: @ 826D447
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft2:: @ 826D447
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D452:: @ 826D452
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft3:: @ 826D452
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D45D:: @ 826D45D
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft3:: @ 826D45D
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D468:: @ 826D468
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft3:: @ 826D468
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D473:: @ 826D473
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft3:: @ 826D473
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D47E:: @ 826D47E
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D60F
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft3:: @ 826D47E
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D489:: @ 826D489
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft4:: @ 826D489
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D494:: @ 826D494
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft4:: @ 826D494
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D49F:: @ 826D49F
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft4:: @ 826D49F
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4AA:: @ 826D4AA
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft4:: @ 826D4AA
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4B5:: @ 826D4B5
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D613
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft4:: @ 826D4B5
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4C0:: @ 826D4C0
-	applymovement 1, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkLeft5:: @ 826D4C0
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4CB:: @ 826D4CB
-	applymovement 2, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkLeft5:: @ 826D4CB
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4D6:: @ 826D4D6
-	applymovement 3, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkLeft5:: @ 826D4D6
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4E1:: @ 826D4E1
-	applymovement 4, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkLeft5:: @ 826D4E1
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4EC:: @ 826D4EC
-	applymovement 5, Movement_26D618
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkLeft5:: @ 826D4EC
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkLeft5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D4F7:: @ 826D4F7
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight1:: @ 826D4F7
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D502:: @ 826D502
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight1:: @ 826D502
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D50D:: @ 826D50D
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight1:: @ 826D50D
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D518:: @ 826D518
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight1:: @ 826D518
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D523:: @ 826D523
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D61E
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight1:: @ 826D523
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight1
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D52E:: @ 826D52E
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight2:: @ 826D52E
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D539:: @ 826D539
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight2:: @ 826D539
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D544:: @ 826D544
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight2:: @ 826D544
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D54F:: @ 826D54F
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight2:: @ 826D54F
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D55A:: @ 826D55A
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D620
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight2:: @ 826D55A
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight2
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D565:: @ 826D565
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight3:: @ 826D565
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D570:: @ 826D570
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight3:: @ 826D570
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D57B:: @ 826D57B
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight3:: @ 826D57B
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D586:: @ 826D586
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight3:: @ 826D586
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D591:: @ 826D591
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D623
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight3:: @ 826D591
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight3
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D59C:: @ 826D59C
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight4:: @ 826D59C
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5A7:: @ 826D5A7
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight4:: @ 826D5A7
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5B2:: @ 826D5B2
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight4:: @ 826D5B2
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5BD:: @ 826D5BD
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight4:: @ 826D5BD
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5C8:: @ 826D5C8
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D627
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight4:: @ 826D5C8
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight4
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5D3:: @ 826D5D3
-	applymovement 1, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll1WalkRight5:: @ 826D5D3
+	applymovement 1, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5DE:: @ 826D5DE
-	applymovement 2, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll2WalkRight5:: @ 826D5DE
+	applymovement 2, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5E9:: @ 826D5E9
-	applymovement 3, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll3WalkRight5:: @ 826D5E9
+	applymovement 3, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5F4:: @ 826D5F4
-	applymovement 4, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll4WalkRight5:: @ 826D5F4
+	applymovement 4, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_EventScript_26D5FF:: @ 826D5FF
-	applymovement 5, Route110_TrickHousePuzzle5_Movement_26D62C
+Route110_TrickHousePuzzle5_EventScript_Mechadoll5WalkRight5:: @ 826D5FF
+	applymovement 5, Route110_TrickHousePuzzle5_Movement_WalkRight5
 	waitmovement 0
 	return
 
-Route110_TrickHousePuzzle5_Movement_26D60A: @ 826D60A
+Route110_TrickHousePuzzle5_Movement_WalkLeft1: @ 826D60A
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D60C: @ 826D60C
+Route110_TrickHousePuzzle5_Movement_WalkLeft2: @ 826D60C
 	walk_left
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D60F: @ 826D60F
+Route110_TrickHousePuzzle5_Movement_WalkLeft3: @ 826D60F
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D613: @ 826D613
+Route110_TrickHousePuzzle5_Movement_WalkLeft4: @ 826D613
 	walk_left
 	walk_left
 	walk_left
 	walk_left
 	step_end
 
-
-Movement_26D618: @ 826D618
+Route110_TrickHousePuzzle5_Movement_WalkLeft5: @ 826D618
 	walk_left
 	walk_left
 	walk_left
@@ -885,29 +890,29 @@ Movement_26D618: @ 826D618
 	walk_left
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D61E: @ 826D61E
+Route110_TrickHousePuzzle5_Movement_WalkRight1: @ 826D61E
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D620: @ 826D620
+Route110_TrickHousePuzzle5_Movement_WalkRight2: @ 826D620
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D623: @ 826D623
+Route110_TrickHousePuzzle5_Movement_WalkRight3: @ 826D623
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D627: @ 826D627
+Route110_TrickHousePuzzle5_Movement_WalkRight4: @ 826D627
 	walk_right
 	walk_right
 	walk_right
 	walk_right
 	step_end
 
-Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
+Route110_TrickHousePuzzle5_Movement_WalkRight5: @ 826D62C
 	walk_right
 	walk_right
 	walk_right
@@ -915,8 +920,7 @@ Route110_TrickHousePuzzle5_Movement_26D62C: @ 826D62C
 	walk_right
 	step_end
 
-Route110_TrickHouseEntrance_Movement_26D632: @ 826D632
-Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
+Route110_TrickHousePuzzle5_Movement_MechadollShake: @ 826D632
 	face_left
 	delay_2
 	face_right
@@ -964,128 +968,128 @@ Route110_TrickHousePuzzle5_Movement_26D632: @ 826D632
 	face_down
 	step_end
 
-Route110_TrickHousePuzzle5_Text_26D660: @ 826D660
+Route110_TrickHousePuzzle5_Text_WroteSecretCodeLockOpened: @ 826D660
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is a genius.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle5_Text_26D6CE: @ 826D6CE
+Route110_TrickHousePuzzle5_Text_Mechadoll1Intro: @ 826D6CE
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 1 AM I!\p"
 	.string "IF YOU ANSWER QUIZZES CORRECTLY,\n"
 	.string "THEN YOU WILL GO TO MECHADOLL 5.\l"
 	.string "THEN YOU CAN OBTAIN THE SECRET CODE.$"
 
-Route110_TrickHousePuzzle5_Text_26D757: @ 826D757
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz1: @ 826D757
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON is not found\n"
 	.string "on ROUTE 110. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_26D7AA: @ 826D7AA
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz2: @ 826D7AA
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON is not of the\n"
 	.string "WATER type. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_26D7FC: @ 826D7FC
+Route110_TrickHousePuzzle5_Text_Mechadoll1Quiz3: @ 826D7FC
 	.string "MECHADOLL 1 QUIZ.\p"
 	.string "One of these POKéMON does not use\n"
 	.string "LEECH LIFE. Which one is it?$"
 
-Route110_TrickHousePuzzle5_Text_26D84D: @ 826D84D
+Route110_TrickHousePuzzle5_Text_CorrectGoThrough: @ 826D84D
 	.string "CONGRATULATIONS. CORRECT YOU ARE.\n"
 	.string "GO THROUGH. PLEASE.$"
 
-Route110_TrickHousePuzzle5_Text_26D883: @ 826D883
+Route110_TrickHousePuzzle5_Text_DisappointmentError: @ 826D883
 	.string "BZZZT. DISAPPOINTMENT.\n"
 	.string "ERROR.$"
 
-Route110_TrickHousePuzzle5_Text_26D8A1: @ 826D8A1
+Route110_TrickHousePuzzle5_Text_Wahahahaha: @ 826D8A1
 	.string "WAHAHAHAHA! WAHAHAHAHA!\n"
 	.string "CLICKETY-CLACK!$"
 
-Route110_TrickHousePuzzle5_Text_26D8C9: @ 826D8C9
+Route110_TrickHousePuzzle5_Text_WaitForNextChallenge: @ 826D8C9
 	.string "YOUR NEXT CHALLENGE WE WAIT FOR.$"
 
-Route110_TrickHousePuzzle5_Text_26D8EA: @ 826D8EA
+Route110_TrickHousePuzzle5_Text_Mechadoll2Intro: @ 826D8EA
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 2 AM I!\p"
 	.string "MECHADOLL 1'S QUIZ DIFFICULTY LEVEL\n"
 	.string "IS SET TOO LOW.$"
 
-Route110_TrickHousePuzzle5_Text_26D940: @ 826D940
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz1: @ 826D940
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON did WALLY\n"
 	.string "borrow from your father?$"
 
-Route110_TrickHousePuzzle5_Text_26D98C: @ 826D98C
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz2: @ 826D98C
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON was chasing\n"
 	.string "PROF. BIRCH?$"
 
-Route110_TrickHousePuzzle5_Text_26D9CE: @ 826D9CE
+Route110_TrickHousePuzzle5_Text_Mechadoll2Quiz3: @ 826D9CE
 	.string "MECHADOLL 2 QUIZ.\p"
 	.string "Which of these POKéMON did TEAM AQUA\n"
 	.string "use in PETALBURG FOREST?$"
 
-Route110_TrickHousePuzzle5_Text_26DA1E: @ 826DA1E
+Route110_TrickHousePuzzle5_Text_Mechadoll3Intro: @ 826DA1E
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 3 AM I!\p"
 	.string "MATTERS OF MONEY ARE MY SOLE FOCUS.$"
 
-Route110_TrickHousePuzzle5_Text_26DA64: @ 826DA64
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz1: @ 826DA64
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Which costs more?\n"
 	.string "Three HARBOR MAILS or one BURN HEAL?$"
 
-Route110_TrickHousePuzzle5_Text_26DAAD: @ 826DAAD
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz2: @ 826DAAD
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Sell one GREAT BALL and buy\n"
 	.string "one POTION. How much money remains?$"
 
-Route110_TrickHousePuzzle5_Text_26DAFF: @ 826DAFF
+Route110_TrickHousePuzzle5_Text_Mechadoll3Quiz3: @ 826DAFF
 	.string "MECHADOLL 3 QUIZ.\p"
 	.string "Do one REPEL and SODA POP cost\n"
 	.string "more than one SUPER POTION?$"
 
-Route110_TrickHousePuzzle5_Text_26DB4C: @ 826DB4C
+Route110_TrickHousePuzzle5_Text_Mechadoll4Intro: @ 826DB4C
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 4 THAT IS ME!\p"
 	.string "MY QUIZ IS AN OBJECT OF BEAUTY.$"
 
-Route110_TrickHousePuzzle5_Text_26DB94: @ 826DB94
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz1: @ 826DB94
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In SEASHORE HOUSE, were there more men\n"
 	.string "or women?$"
 
-Route110_TrickHousePuzzle5_Text_26DBD7: @ 826DBD7
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz2: @ 826DBD7
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In LAVARIDGE TOWN, were there more\n"
 	.string "elderly men or elderly women?$"
 
-Route110_TrickHousePuzzle5_Text_26DC2A: @ 826DC2A
+Route110_TrickHousePuzzle5_Text_Mechadoll4Quiz3: @ 826DC2A
 	.string "MECHADOLL 4 QUIZ.\p"
 	.string "In the TRAINER'S SCHOOL, how many\n"
 	.string "girl students were there?$"
 
-Route110_TrickHousePuzzle5_Text_26DC78: @ 826DC78
+Route110_TrickHousePuzzle5_Text_Mechadoll5Intro: @ 826DC78
 	.string "CLICKETY-CLACK…\n"
 	.string "MECHADOLL 5 AM I!\p"
 	.string "THE MASTER'S BEST AND PROUDEST\n"
 	.string "ACHIEVEMENT AM I.$"
 
-Route110_TrickHousePuzzle5_Text_26DCCB: @ 826DCCB
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz1: @ 826DCCB
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "In SLATEPORT's POKéMON FAN CLUB,\n"
 	.string "how many POKéMON were there?$"
 
-Route110_TrickHousePuzzle5_Text_26DD1B: @ 826DD1B
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz2: @ 826DD1B
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "In FORTREE CITY, how many\n"
 	.string "tree houses were there?$"
 
-Route110_TrickHousePuzzle5_Text_26DD5F: @ 826DD5F
+Route110_TrickHousePuzzle5_Text_Mechadoll5Quiz3: @ 826DD5F
 	.string "MECHADOLL 5 QUIZ.\p"
 	.string "On the CYCLING ROAD, how many\n"
 	.string "TRIATHLETES were there?$"
diff --git a/data/maps/Route110_TrickHousePuzzle6/map.json b/data/maps/Route110_TrickHousePuzzle6/map.json
index aef182fbb..797bb9f60 100644
--- a/data/maps/Route110_TrickHousePuzzle6/map.json
+++ b/data/maps/Route110_TrickHousePuzzle6/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle6_EventScript_26DDE1",
+      "script": "Route110_TrickHousePuzzle6_EventScript_Sophia",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "3",
-      "script": "Route110_TrickHousePuzzle6_EventScript_26DDF8",
+      "script": "Route110_TrickHousePuzzle6_EventScript_Benny",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle6_EventScript_26DE0F",
+      "script": "Route110_TrickHousePuzzle6_EventScript_Sebastian",
       "flag": "0"
     },
     {
@@ -98,7 +98,7 @@
       "y": 10,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle6_EventScript_26DDC4"
+      "script": "Route110_TrickHousePuzzle6_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle6/scripts.inc b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
index 685a0170b..142b89f42 100644
--- a/data/maps/Route110_TrickHousePuzzle6/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle6/scripts.inc
@@ -1,87 +1,87 @@
 Route110_TrickHousePuzzle6_MapScripts:: @ 826DDA7
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle6_OnTransition
-	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_MapScript2_26DDB6
+	map_script MAP_SCRIPT_ON_WARP_INTO_MAP_TABLE, Route110_TrickHousePuzzle6_OnWarp
 	.byte 0
 
 Route110_TrickHousePuzzle6_OnTransition: @ 826DDB2
 	special RotatingGate_InitPuzzle
 	end
 
-Route110_TrickHousePuzzle6_MapScript2_26DDB6: @ 826DDB6
-	map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_26DDC0
+Route110_TrickHousePuzzle6_OnWarp: @ 826DDB6
+	map_script_2 VAR_TEMP_0, VAR_TEMP_0, Route110_TrickHousePuzzle6_EventScript_InitPuzzle
 	.2byte 0
 
-Route110_TrickHousePuzzle6_EventScript_26DDC0:: @ 826DDC0
+Route110_TrickHousePuzzle6_EventScript_InitPuzzle:: @ 826DDC0
 	special RotatingGate_InitPuzzleAndGraphics
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DDC4:: @ 826DDC4
+Route110_TrickHousePuzzle6_EventScript_Scroll:: @ 826DDC4
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle6_EventScript_26DDD6
-	goto Route110_TrickHousePuzzle6_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle6_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DDD6:: @ 826DDD6
+Route110_TrickHousePuzzle6_EventScript_FoundScroll:: @ 826DDD6
 	setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1
-	goto Route110_TrickHousePuzzle6_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DDE1:: @ 826DDE1
-	trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_26DE93, Route110_TrickHousePuzzle6_Text_26DED2
-	msgbox Route110_TrickHousePuzzle6_Text_26DEF3, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle6_EventScript_Sophia:: @ 826DDE1
+	trainerbattle_single TRAINER_SOPHIA, Route110_TrickHousePuzzle6_Text_SophiaIntro, Route110_TrickHousePuzzle6_Text_SophiaDefeat
+	msgbox Route110_TrickHousePuzzle6_Text_SophiaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DDF8:: @ 826DDF8
-	trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_26DF55, Route110_TrickHousePuzzle6_Text_26DF8D
-	msgbox Route110_TrickHousePuzzle6_Text_26DFA0, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle6_EventScript_Benny:: @ 826DDF8
+	trainerbattle_single TRAINER_BENNY, Route110_TrickHousePuzzle6_Text_BennyIntro, Route110_TrickHousePuzzle6_Text_BennyDefeat
+	msgbox Route110_TrickHousePuzzle6_Text_BennyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_EventScript_26DE0F:: @ 826DE0F
-	trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_26DFD7, Route110_TrickHousePuzzle6_Text_26E004
-	msgbox Route110_TrickHousePuzzle6_Text_26E048, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle6_EventScript_Sebastian:: @ 826DE0F
+	trainerbattle_single TRAINER_SEBASTIAN, Route110_TrickHousePuzzle6_Text_SebastianIntro, Route110_TrickHousePuzzle6_Text_SebastianDefeat
+	msgbox Route110_TrickHousePuzzle6_Text_SebastianPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle6_Text_26DE26: @ 826DE26
+Route110_TrickHousePuzzle6_Text_WroteSecretCodeLockOpened: @ 826DE26
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is my life.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle6_Text_26DE93: @ 826DE93
+Route110_TrickHousePuzzle6_Text_SophiaIntro: @ 826DE93
 	.string "When I heard there was a strange\n"
 	.string "house, I had to check it out.$"
 
-Route110_TrickHousePuzzle6_Text_26DED2: @ 826DED2
+Route110_TrickHousePuzzle6_Text_SophiaDefeat: @ 826DED2
 	.string "I've discovered a tough TRAINER!$"
 
-Route110_TrickHousePuzzle6_Text_26DEF3: @ 826DEF3
+Route110_TrickHousePuzzle6_Text_SophiaPostBattle: @ 826DEF3
 	.string "I'm sure having a good time checking\n"
 	.string "this place out.\p"
 	.string "It's a challenge I've found worth\n"
 	.string "repeating!$"
 
-Route110_TrickHousePuzzle6_Text_26DF55: @ 826DF55
+Route110_TrickHousePuzzle6_Text_BennyIntro: @ 826DF55
 	.string "Maybe I could get my BIRD POKéMON\n"
 	.string "to fly over the wall…$"
 
-Route110_TrickHousePuzzle6_Text_26DF8D: @ 826DF8D
+Route110_TrickHousePuzzle6_Text_BennyDefeat: @ 826DF8D
 	.string "Gwaaah! I blew it!$"
 
-Route110_TrickHousePuzzle6_Text_26DFA0: @ 826DFA0
+Route110_TrickHousePuzzle6_Text_BennyPostBattle: @ 826DFA0
 	.string "Ehehehe… I guess I lost because\n"
 	.string "I was trying to cheat.$"
 
-Route110_TrickHousePuzzle6_Text_26DFD7: @ 826DFD7
+Route110_TrickHousePuzzle6_Text_SebastianIntro: @ 826DFD7
 	.string "I'm getting dizzy from these rotating\n"
 	.string "doors…$"
 
-Route110_TrickHousePuzzle6_Text_26E004: @ 826E004
+Route110_TrickHousePuzzle6_Text_SebastianDefeat: @ 826E004
 	.string "Everything's spinning around and\n"
 	.string "around. I can't take this anymore…$"
 
-Route110_TrickHousePuzzle6_Text_26E048: @ 826E048
+Route110_TrickHousePuzzle6_Text_SebastianPostBattle: @ 826E048
 	.string "You don't seem to be affected at all.\n"
 	.string "Or do you have your poker face on?$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle7/map.json b/data/maps/Route110_TrickHousePuzzle7/map.json
index 09fdafbe2..1e31e2f74 100644
--- a/data/maps/Route110_TrickHousePuzzle7/map.json
+++ b/data/maps/Route110_TrickHousePuzzle7/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E389",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Joshua",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3B7",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Alexis",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3A0",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Patricia",
       "flag": "0"
     },
     {
@@ -76,7 +76,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3E5",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Alvaro",
       "flag": "0"
     },
     {
@@ -89,7 +89,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3CE",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Mariela",
       "flag": "0"
     },
     {
@@ -102,7 +102,7 @@
       "movement_range_y": 1,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E3FC",
+      "script": "Route110_TrickHousePuzzle7_EventScript_Everett",
       "flag": "0"
     },
     {
@@ -233,7 +233,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E31B"
+      "script": "Route110_TrickHousePuzzle7_EventScript_YellowButton"
     },
     {
       "type": "trigger",
@@ -242,7 +242,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E331"
+      "script": "Route110_TrickHousePuzzle7_EventScript_BlueButton"
     },
     {
       "type": "trigger",
@@ -251,7 +251,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E347"
+      "script": "Route110_TrickHousePuzzle7_EventScript_GreenButton"
     },
     {
       "type": "trigger",
@@ -260,7 +260,7 @@
       "elevation": 0,
       "var": "VAR_TEMP_1",
       "var_value": "0",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E35D"
+      "script": "Route110_TrickHousePuzzle7_EventScript_PurpleButton"
     }
   ],
   "bg_events": [
@@ -270,7 +270,7 @@
       "y": 17,
       "elevation": 0,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle7_EventScript_26E1D0"
+      "script": "Route110_TrickHousePuzzle7_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
index b5303bc24..6b7559389 100644
--- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc
@@ -1,75 +1,79 @@
 Route110_TrickHousePuzzle7_MapScripts:: @ 826E091
-	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_MapScript1_26E0A6
+	map_script MAP_SCRIPT_ON_RESUME, Route110_TrickHousePuzzle7_OnResume
 	map_script MAP_SCRIPT_ON_TRANSITION, Route110_TrickHousePuzzle7_OnTransition
-	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_MapScript1_26E1B4
-	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_MapScript2_26E1C0
+	map_script MAP_SCRIPT_ON_LOAD, Route110_TrickHousePuzzle7_OnLoad
+	map_script MAP_SCRIPT_ON_FRAME_TABLE, Route110_TrickHousePuzzle7_OnFrame
 	.byte 0
 
-Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6
-	call Route110_TrickHousePuzzle7_EventScript_26E0AC
+@ Puzzle Room 7 in RSE uses whatever puzzle Mossdeep Gym uses
+@ Because Mossdeep Gym was redesigned for Emerald, theres a good deal of leftover script from the old R/S puzzle
+
+Route110_TrickHousePuzzle7_OnResume: @ 826E0A6
+	call Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E0DA
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E0ED
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E100
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E113
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E126
+Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles:: @ 826E0AC
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA
+@ Leftover from R/S, none of the below metatile scripts are ever called
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn:: @ 826E0DA
 	setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E0ED:: @ 826E0ED
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn:: @ 826E0ED
 	setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E100:: @ 826E100
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn:: @ 826E100
 	setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Up, 0
 	setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E113:: @ 826E113
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn:: @ 826E113
 	setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right_Alt, 0
 	setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E126:: @ 826E126
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn:: @ 826E126
 	setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
 	setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_On, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E139:: @ 826E139
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff:: @ 826E139
 	setmetatile 13, 17, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
 	setmetatile 12, 16, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E14C:: @ 826E14C
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff:: @ 826E14C
 	setmetatile 12, 13, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left, 0
 	setmetatile 12, 11, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E15F:: @ 826E15F
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff:: @ 826E15F
 	setmetatile 7, 12, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Down, 0
 	setmetatile 5, 10, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E172:: @ 826E172
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff:: @ 826E172
 	setmetatile 6, 6, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Left_Alt, 0
 	setmetatile 4, 4, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
-Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff:: @ 826E185
 	setmetatile 8, 4, METATILE_TrickHousePuzzle_Arrow_RedOnBlack_Right, 0
 	setmetatile 7, 5, METATILE_TrickHousePuzzle_Lever_Off, 1
 	return
 
 Route110_TrickHousePuzzle7_OnTransition: @ 826E198
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3
+	goto_if_eq Route110_TrickHousePuzzle7_EventScript_TeleportedTransition
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
@@ -77,35 +81,36 @@ Route110_TrickHousePuzzle7_OnTransition: @ 826E198
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1B3:: @ 826E1B3
+Route110_TrickHousePuzzle7_EventScript_TeleportedTransition:: @ 826E1B3
 	end
 
-Route110_TrickHousePuzzle7_MapScript1_26E1B4: @ 826E1B4
+Route110_TrickHousePuzzle7_OnLoad: @ 826E1B4
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
-	call_if_eq Route110_TrickHousePuzzle7_EventScript_26E0AC
+	call_if_eq Route110_TrickHousePuzzle7_EventScript_UpdateSwitchMetatiles
 	end
 
-Route110_TrickHousePuzzle7_MapScript2_26E1C0: @ 826E1C0
-	map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_26E1CA
+Route110_TrickHousePuzzle7_OnFrame: @ 826E1C0
+	map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_ClearState2
 	.2byte 0
 
-Route110_TrickHousePuzzle7_EventScript_26E1CA:: @ 826E1CA
+Route110_TrickHousePuzzle7_EventScript_ClearState2:: @ 826E1CA
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1D0:: @ 826E1D0
+Route110_TrickHousePuzzle7_EventScript_Scroll:: @ 826E1D0
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1E2
-	goto Route110_TrickHousePuzzle7_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle7_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1E2:: @ 826E1E2
+Route110_TrickHousePuzzle7_EventScript_FoundScroll:: @ 826E1E2
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1
-	goto Route110_TrickHousePuzzle7_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
+@ Unused, leftover from R/S
+Route110_TrickHousePuzzle7_EventScript_TeleportPad:: @ 826E1ED
 	lockall
 	setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1
 	warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19
@@ -113,112 +118,115 @@ Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE
+@ All the below switch scripts are unused leftover from R/S
+Route110_TrickHousePuzzle7_EventScript_Switch1:: @ 826E1FE
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E0DA
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E139
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E2E9
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E2EE
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D
+Route110_TrickHousePuzzle7_EventScript_Switch2:: @ 826E22D
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E0ED
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E14C
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E2F3
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E2F8
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C
+Route110_TrickHousePuzzle7_EventScript_Switch3:: @ 826E25C
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E100
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E15F
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E2FD
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E302
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B
+Route110_TrickHousePuzzle7_EventScript_Switch4:: @ 826E28B
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E113
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E172
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E307
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E30C
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA
+Route110_TrickHousePuzzle7_EventScript_Switch5:: @ 826E2BA
 	lockall
 	delay 32
-	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E126
-	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E185
+	call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOn
+	call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5MetatilesOff
 	special DrawWholeMapView
 	playse SE_TK_KASYA
-	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E311
-	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E316
+	goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5On
+	goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9
+@ All the below switch scripts are unused leftover from R/S
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1On:: @ 826E2E9
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE
+Route110_TrickHousePuzzle7_EventScript_SetSwitch1Off:: @ 826E2EE
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2On:: @ 826E2F3
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8
+Route110_TrickHousePuzzle7_EventScript_SetSwitch2Off:: @ 826E2F8
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3On:: @ 826E2FD
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302
+Route110_TrickHousePuzzle7_EventScript_SetSwitch3Off:: @ 826E302
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4On:: @ 826E307
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C
+Route110_TrickHousePuzzle7_EventScript_SetSwitch4Off:: @ 826E30C
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5On:: @ 826E311
 	setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316
+Route110_TrickHousePuzzle7_EventScript_SetSwitch5Off:: @ 826E316
 	clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5
 	releaseall
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B
+@ From here is where the new, actually used puzzle scripts begin
+Route110_TrickHousePuzzle7_EventScript_YellowButton:: @ 826E31B
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -230,7 +238,7 @@ Route110_TrickHousePuzzle7_EventScript_26E31B:: @ 826E31B
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331
+Route110_TrickHousePuzzle7_EventScript_BlueButton:: @ 826E331
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -242,7 +250,7 @@ Route110_TrickHousePuzzle7_EventScript_26E331:: @ 826E331
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347
+Route110_TrickHousePuzzle7_EventScript_GreenButton:: @ 826E347
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -254,7 +262,7 @@ Route110_TrickHousePuzzle7_EventScript_26E347:: @ 826E347
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D
+Route110_TrickHousePuzzle7_EventScript_PurpleButton:: @ 826E35D
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -266,7 +274,8 @@ Route110_TrickHousePuzzle7_EventScript_26E35D:: @ 826E35D
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
+@ Unused
+Route110_TrickHousePuzzle7_EventScript_RedButton:: @ 826E373
 	playse SE_MU_PACHI
 	waitse
 	playse SE_TU_SAA
@@ -278,109 +287,109 @@ Route110_TrickHousePuzzle7_EventScript_26E373:: @ 826E373
 	freerotatingtilepuzzle
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E389:: @ 826E389
-	trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_26E481, Route110_TrickHousePuzzle7_Text_26E4C1
-	msgbox Route110_TrickHousePuzzle7_Text_26E4F4, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Joshua:: @ 826E389
+	trainerbattle_single TRAINER_JOSHUA, Route110_TrickHousePuzzle7_Text_JoshuaIntro, Route110_TrickHousePuzzle7_Text_JoshuaDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_JoshuaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3A0:: @ 826E3A0
-	trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_26E531, Route110_TrickHousePuzzle7_Text_26E564
-	msgbox Route110_TrickHousePuzzle7_Text_26E57F, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Patricia:: @ 826E3A0
+	trainerbattle_single TRAINER_PATRICIA, Route110_TrickHousePuzzle7_Text_PatriciaIntro, Route110_TrickHousePuzzle7_Text_PatriciaDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_PatriciaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3B7:: @ 826E3B7
-	trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_26E5C0, Route110_TrickHousePuzzle7_Text_26E604
-	msgbox Route110_TrickHousePuzzle7_Text_26E61E, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Alexis:: @ 826E3B7
+	trainerbattle_single TRAINER_ALEXIS, Route110_TrickHousePuzzle7_Text_AlexisIntro, Route110_TrickHousePuzzle7_Text_AlexisDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_AlexisPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3CE:: @ 826E3CE
-	trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_26E66B, Route110_TrickHousePuzzle7_Text_26E69C
-	msgbox Route110_TrickHousePuzzle7_Text_26E6BC, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Mariela:: @ 826E3CE
+	trainerbattle_single TRAINER_MARIELA, Route110_TrickHousePuzzle7_Text_MarielaIntro, Route110_TrickHousePuzzle7_Text_MarielaDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_MarielaPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3E5:: @ 826E3E5
-	trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_26E6DA, Route110_TrickHousePuzzle7_Text_26E700
-	msgbox Route110_TrickHousePuzzle7_Text_26E722, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Alvaro:: @ 826E3E5
+	trainerbattle_single TRAINER_ALVARO, Route110_TrickHousePuzzle7_Text_AlvaroIntro, Route110_TrickHousePuzzle7_Text_AlvaroDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_AlvaroPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E3FC:: @ 826E3FC
-	trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_26E78D, Route110_TrickHousePuzzle7_Text_26E7AB
-	msgbox Route110_TrickHousePuzzle7_Text_26E7C4, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle7_EventScript_Everett:: @ 826E3FC
+	trainerbattle_single TRAINER_EVERETT, Route110_TrickHousePuzzle7_Text_EverettIntro, Route110_TrickHousePuzzle7_Text_EverettDefeat
+	msgbox Route110_TrickHousePuzzle7_Text_EverettPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle7_EventScript_26E413:: @ 826E413
+Route110_TrickHousePuzzle7_EventScript_WroteSecretCodeLockOpened:: @ 826E413
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER is huggable.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle7_Text_26E481: @ 826E481
+Route110_TrickHousePuzzle7_Text_JoshuaIntro: @ 826E481
 	.string "The TRICK MASTER always vanishes\n"
 	.string "like smoke. How does he do it?$"
 
-Route110_TrickHousePuzzle7_Text_26E4C1: @ 826E4C1
+Route110_TrickHousePuzzle7_Text_JoshuaDefeat: @ 826E4C1
 	.string "Aiyeeeh! You're much too strong!\n"
 	.string "How do you do it?$"
 
-Route110_TrickHousePuzzle7_Text_26E4F4: @ 826E4F4
+Route110_TrickHousePuzzle7_Text_JoshuaPostBattle: @ 826E4F4
 	.string "I wish I could appear and disappear as\n"
 	.string "if I were smoke, too.$"
 
-Route110_TrickHousePuzzle7_Text_26E531: @ 826E531
+Route110_TrickHousePuzzle7_Text_PatriciaIntro: @ 826E531
 	.string "Going around the same spot…\n"
 	.string "It begets ill fortune…$"
 
-Route110_TrickHousePuzzle7_Text_26E564: @ 826E564
+Route110_TrickHousePuzzle7_Text_PatriciaDefeat: @ 826E564
 	.string "Defeated!\n"
 	.string "It's a bad sign…$"
 
-Route110_TrickHousePuzzle7_Text_26E57F: @ 826E57F
+Route110_TrickHousePuzzle7_Text_PatriciaPostBattle: @ 826E57F
 	.string "I've circled the same spot over ten\n"
 	.string "times now… It's ill fortune…$"
 
-Route110_TrickHousePuzzle7_Text_26E5C0: @ 826E5C0
+Route110_TrickHousePuzzle7_Text_AlexisIntro: @ 826E5C0
 	.string "Whoever wins will get through here\n"
 	.string "first. That's the feeling I get.$"
 
-Route110_TrickHousePuzzle7_Text_26E604: @ 826E604
+Route110_TrickHousePuzzle7_Text_AlexisDefeat: @ 826E604
 	.string "Oh!\n"
 	.string "Well, go ahead, then!$"
 
-Route110_TrickHousePuzzle7_Text_26E61E: @ 826E61E
+Route110_TrickHousePuzzle7_Text_AlexisPostBattle: @ 826E61E
 	.string "You're solving all the puzzles in the\n"
 	.string "TRICK HOUSE. That's the feeling I get.$"
 
-Route110_TrickHousePuzzle7_Text_26E66B: @ 826E66B
+Route110_TrickHousePuzzle7_Text_MarielaIntro: @ 826E66B
 	.string "Nufufufu, here at last!\n"
 	.string "Let's get right with it!$"
 
-Route110_TrickHousePuzzle7_Text_26E69C: @ 826E69C
+Route110_TrickHousePuzzle7_Text_MarielaDefeat: @ 826E69C
 	.string "You're so casual about winning!$"
 
-Route110_TrickHousePuzzle7_Text_26E6BC: @ 826E6BC
+Route110_TrickHousePuzzle7_Text_MarielaPostBattle: @ 826E6BC
 	.string "Humph! I'm not upset!\n"
 	.string "Not me!$"
 
-Route110_TrickHousePuzzle7_Text_26E6DA: @ 826E6DA
+Route110_TrickHousePuzzle7_Text_AlvaroIntro: @ 826E6DA
 	.string "I ever so closely watched you coming!$"
 
-Route110_TrickHousePuzzle7_Text_26E700: @ 826E700
+Route110_TrickHousePuzzle7_Text_AlvaroDefeat: @ 826E700
 	.string "This outcome I didn't see coming…$"
 
-Route110_TrickHousePuzzle7_Text_26E722: @ 826E722
+Route110_TrickHousePuzzle7_Text_AlvaroPostBattle: @ 826E722
 	.string "Well, anyway, we both picked a weird\n"
 	.string "place to get acquainted.\p"
 	.string "As one weirdo to another,\n"
 	.string "let's do our best!$"
 
-Route110_TrickHousePuzzle7_Text_26E78D: @ 826E78D
+Route110_TrickHousePuzzle7_Text_EverettIntro: @ 826E78D
 	.string "It's awfully cramped in here…$"
 
-Route110_TrickHousePuzzle7_Text_26E7AB: @ 826E7AB
+Route110_TrickHousePuzzle7_Text_EverettDefeat: @ 826E7AB
 	.string "Oh, yes, strong you are.$"
 
-Route110_TrickHousePuzzle7_Text_26E7C4: @ 826E7C4
+Route110_TrickHousePuzzle7_Text_EverettPostBattle: @ 826E7C4
 	.string "I was hoping to switch places with you\n"
 	.string "when I beat you, but…$"
 
diff --git a/data/maps/Route110_TrickHousePuzzle8/map.json b/data/maps/Route110_TrickHousePuzzle8/map.json
index b7a06abce..9e4be0cfc 100644
--- a/data/maps/Route110_TrickHousePuzzle8/map.json
+++ b/data/maps/Route110_TrickHousePuzzle8/map.json
@@ -24,7 +24,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle8_EventScript_26E81F",
+      "script": "Route110_TrickHousePuzzle8_EventScript_Vincent",
       "flag": "0"
     },
     {
@@ -37,7 +37,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle8_EventScript_26E84D",
+      "script": "Route110_TrickHousePuzzle8_EventScript_Leroy",
       "flag": "0"
     },
     {
@@ -50,7 +50,7 @@
       "movement_range_y": 0,
       "trainer_type": "1",
       "trainer_sight_or_berry_tree_id": "1",
-      "script": "Route110_TrickHousePuzzle8_EventScript_26E836",
+      "script": "Route110_TrickHousePuzzle8_EventScript_Keira",
       "flag": "0"
     },
     {
@@ -98,7 +98,7 @@
       "y": 21,
       "elevation": 3,
       "player_facing_dir": "BG_EVENT_PLAYER_FACING_ANY",
-      "script": "Route110_TrickHousePuzzle8_EventScript_26E802"
+      "script": "Route110_TrickHousePuzzle8_EventScript_Scroll"
     }
   ]
 }
\ No newline at end of file
diff --git a/data/maps/Route110_TrickHousePuzzle8/scripts.inc b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
index dcb12e366..9e4218234 100644
--- a/data/maps/Route110_TrickHousePuzzle8/scripts.inc
+++ b/data/maps/Route110_TrickHousePuzzle8/scripts.inc
@@ -1,72 +1,72 @@
 Route110_TrickHousePuzzle8_MapScripts:: @ 826E801
 	.byte 0
 
-Route110_TrickHousePuzzle8_EventScript_26E802:: @ 826E802
+Route110_TrickHousePuzzle8_EventScript_Scroll:: @ 826E802
 	lockall
 	compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0
-	goto_if_eq Route110_TrickHousePuzzle8_EventScript_26E814
-	goto Route110_TrickHousePuzzle8_EventScript_26A3DB
+	goto_if_eq Route110_TrickHousePuzzle8_EventScript_FoundScroll
+	goto Route110_TrickHousePuzzle_EventScript_ReadScrollAgain
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E814:: @ 826E814
+Route110_TrickHousePuzzle8_EventScript_FoundScroll:: @ 826E814
 	setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1
-	goto Route110_TrickHousePuzzle8_EventScript_26A3E5
+	goto Route110_TrickHousePuzzle_EventScript_FoundScroll
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E81F:: @ 826E81F
-	trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_26E8CD, Route110_TrickHousePuzzle8_Text_26E8F6
-	msgbox Route110_TrickHousePuzzle8_Text_26E918, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle8_EventScript_Vincent:: @ 826E81F
+	trainerbattle_single TRAINER_VINCENT, Route110_TrickHousePuzzle8_Text_VincentIntro, Route110_TrickHousePuzzle8_Text_VincentDefeat
+	msgbox Route110_TrickHousePuzzle8_Text_VincentPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E836:: @ 826E836
-	trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_26E954, Route110_TrickHousePuzzle8_Text_26E97F
-	msgbox Route110_TrickHousePuzzle8_Text_26E99F, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle8_EventScript_Keira:: @ 826E836
+	trainerbattle_single TRAINER_KEIRA, Route110_TrickHousePuzzle8_Text_KeiraIntro, Route110_TrickHousePuzzle8_Text_KeiraDefeat
+	msgbox Route110_TrickHousePuzzle8_Text_KeiraPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E84D:: @ 826E84D
-	trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_26E9D7, Route110_TrickHousePuzzle8_Text_26EA14
-	msgbox Route110_TrickHousePuzzle8_Text_26EA3F, MSGBOX_AUTOCLOSE
+Route110_TrickHousePuzzle8_EventScript_Leroy:: @ 826E84D
+	trainerbattle_single TRAINER_LEROY, Route110_TrickHousePuzzle8_Text_LeroyIntro, Route110_TrickHousePuzzle8_Text_LeroyDefeat
+	msgbox Route110_TrickHousePuzzle8_Text_LeroyPostBattle, MSGBOX_AUTOCLOSE
 	end
 
-Route110_TrickHousePuzzle8_EventScript_26E864:: @ 826E864
+Route110_TrickHousePuzzle8_EventScript_WroteSecretCodeLockOpened:: @ 826E864
 	.string "{PLAYER} wrote down the secret code\n"
 	.string "on the door.\p"
 	.string "“TRICK MASTER I love.”\n"
 	.string "… … … … … … … …\p"
 	.string "The lock clicked open!$"
 
-Route110_TrickHousePuzzle8_Text_26E8CD: @ 826E8CD
+Route110_TrickHousePuzzle8_Text_VincentIntro: @ 826E8CD
 	.string "Not many TRAINERS have made it\n"
 	.string "this far.$"
 
-Route110_TrickHousePuzzle8_Text_26E8F6: @ 826E8F6
+Route110_TrickHousePuzzle8_Text_VincentDefeat: @ 826E8F6
 	.string "That must mean you're tough, too…$"
 
-Route110_TrickHousePuzzle8_Text_26E918: @ 826E918
+Route110_TrickHousePuzzle8_Text_VincentPostBattle: @ 826E918
 	.string "You've beaten the POKéMON LEAGUE\n"
 	.string "CHAMPION? That's too much!$"
 
-Route110_TrickHousePuzzle8_Text_26E954: @ 826E954
+Route110_TrickHousePuzzle8_Text_KeiraIntro: @ 826E954
 	.string "Consider yourself lucky to be\n"
 	.string "battling me!$"
 
-Route110_TrickHousePuzzle8_Text_26E97F: @ 826E97F
+Route110_TrickHousePuzzle8_Text_KeiraDefeat: @ 826E97F
 	.string "This isn't right!\n"
 	.string "I can't lose!$"
 
-Route110_TrickHousePuzzle8_Text_26E99F: @ 826E99F
+Route110_TrickHousePuzzle8_Text_KeiraPostBattle: @ 826E99F
 	.string "It's a miracle that you beat me.\n"
 	.string "You can brag about it.$"
 
-Route110_TrickHousePuzzle8_Text_26E9D7: @ 826E9D7
+Route110_TrickHousePuzzle8_Text_LeroyIntro: @ 826E9D7
 	.string "You've been slugging through the TRICK\n"
 	.string "HOUSE challenge, too.$"
 
-Route110_TrickHousePuzzle8_Text_26EA14: @ 826EA14
+Route110_TrickHousePuzzle8_Text_LeroyDefeat: @ 826EA14
 	.string "I see…\n"
 	.string "You possess an extraordinary style.$"
 
-Route110_TrickHousePuzzle8_Text_26EA3F: @ 826EA3F
+Route110_TrickHousePuzzle8_Text_LeroyPostBattle: @ 826EA3F
 	.string "Seeing someone like you should please\n"
 	.string "the TRICK MASTER.$"
 
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 368f4f287..1d10e2249 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -207,11 +207,11 @@
 #define FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F  0xBF
 #define FLAG_RECEIVED_SUN_STONE_MOSSDEEP     0xC0
 #define FLAG_WALLY_SPEECH                    0xC1
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1   0xC2
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2   0xC3
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3   0xC4
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4   0xC5
-#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5   0xC6
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1   0xC2 // Leftover from the RS version of Puzzle Room 7, functionally unused
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2   0xC3 //
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3   0xC4 //
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4   0xC5 //
+#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5   0xC6 //
 #define FLAG_RUSTURF_TUNNEL_OPENED           0xC7
 #define FLAG_RECEIVED_RED_SCARF              0xC8
 #define FLAG_RECEIVED_BLUE_SCARF             0xC9
diff --git a/include/constants/vars.h b/include/constants/vars.h
index 64ff6622b..3e476935e 100644
--- a/include/constants/vars.h
+++ b/include/constants/vars.h
@@ -179,9 +179,9 @@
 #define VAR_SEAFLOOR_CAVERN_STATE            0x40A2
 #define VAR_CABLE_CAR_STATION_STATE          0x40A3
 #define VAR_SAFARI_ZONE_STATE                0x40A4  // 0: In or out of SZ, 1: Player exiting SZ, 2: Player entering SZ
-#define VAR_TRICK_HOUSE_ENTRANCE_STATE_1     0x40A5
-#define VAR_TRICK_HOUSE_ENTRANCE_STATE_2     0x40A6
-#define VAR_TRICK_HOUSE_ENTRANCE_STATE_3     0x40A7
+#define VAR_TRICK_HOUSE_BEING_WATCHED_STATE  0x40A5
+#define VAR_TRICK_HOUSE_FOUND_TRICK_MASTER   0x40A6
+#define VAR_TRICK_HOUSE_ENTRANCE_STATE       0x40A7
 #define VAR_UNUSED_0x40A8                    0x40A8 // Unused Var
 #define VAR_CYCLING_CHALLENGE_STATE          0x40A9
 #define VAR_SLATEPORT_MUSEUM_1F_STATE        0x40AA
@@ -195,8 +195,8 @@
 #define VAR_TRICK_HOUSE_PUZZLE_8_STATE       0x40B2
 #define VAR_WEATHER_INSTITUTE_STATE          0x40B3
 #define VAR_PORTHOLE_STATE                   0x40B4
-#define VAR_TRICK_HOUSE_STATE                0x40B5 // TODO: needs some further investigation
-#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2     0x40B6
+#define VAR_TRICK_HOUSE_ENTER_FROM_CORRIDOR  0x40B5
+#define VAR_TRICK_HOUSE_PUZZLE_7_STATE_2     0x40B6 // Leftover from RS, never set
 #define VAR_SLATEPORT_FAN_CLUB_STATE         0x40B7
 #define VAR_UNUSED_0x40B8                    0x40B8 // Unused Var
 #define VAR_MT_PYRE_STATE                    0x40B9
diff --git a/include/event_scripts.h b/include/event_scripts.h
index b86c46df0..5579b2163 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -527,7 +527,7 @@ extern const u8 EventScript_ClosedSootopolisDoor[];
 extern const u8 SkyPillar_Outside_EventScript_2393F9[];
 extern const u8 EventScript_CableBoxResults[];
 extern const u8 EventScript_PokeBlockFeeder[];
-extern const u8 Route110_TrickHouseEntrance_EventScript_26A22A[];
+extern const u8 Route110_TrickHousePuzzle_EventScript_Door[];
 extern const u8 EventScript_RegionMap[];
 extern const u8 EventScript_RunningShoesManual[];
 extern const u8 EventScript_PictureBookShelf[];
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index bbd2ebda9..15294159c 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -380,7 +380,7 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
     if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE)
         return EventScript_PokeBlockFeeder;
     if (MetatileBehavior_IsTrickHousePuzzleDoor(metatileBehavior) == TRUE)
-        return Route110_TrickHouseEntrance_EventScript_26A22A;
+        return Route110_TrickHousePuzzle_EventScript_Door;
     if (MetatileBehavior_IsRegionMap(metatileBehavior) == TRUE)
         return EventScript_RegionMap;
     if (MetatileBehavior_IsRunningShoesManual(metatileBehavior) == TRUE)