Merge remote-tracking branch 'upstream' into tustin2121-patch-5

1 files changed, 149 insertions, 149 deletions

diff --git a/data/maps/Route110_TrickHouseEnd/scripts.inc b/data/maps/Route110_TrickHouseEnd/scripts.inc
index 52a0f19f5..7fec5ffa7 100644
--- a/data/maps/Route110_TrickHouseEnd/scripts.inc
+++ b/data/maps/Route110_TrickHouseEnd/scripts.inc
@@ -1,321 +1,321 @@
 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
 	setvar VAR_TEMP_1, 0
 	setvar VAR_TEMP_2, 0
-	special SetTrickHouseEndRoomFlag
+	special SetTrickHouseNuggetFlag
 	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, 4
+	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
+	giveitem ITEM_RARE_CANDY
+	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
+	giveitem ITEM_TIMER_BALL
+	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
+	giveitem ITEM_HARD_STONE
+	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
+	giveitem ITEM_SMOKE_BALL
+	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
+	giveitem ITEM_TM12
+	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
+	giveitem ITEM_MAGNET
+	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
+	giveitem ITEM_PP_MAX
+	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, 1
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B015
-	compare VAR_FACING, 2
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B020
-	compare VAR_FACING, 3
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B02B
-	compare VAR_FACING, 4
-	call_if_eq Route110_TrickHouseEnd_EventScript_26B036
+	compare VAR_FACING, DIR_SOUTH
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth
+	compare VAR_FACING, DIR_NORTH
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth
+	compare VAR_FACING, DIR_WEST
+	call_if_eq Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest
+	compare VAR_FACING, DIR_EAST
+	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
-	special ResetTrickHouseEndRoomFlag
+	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 ResetTrickHouseNuggetFlag
 	release
 	end
 
-Route110_TrickHouseEnd_EventScript_26AFA5:: @ 826AFA5
-	multichoice 0, 0, 88, 1
+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
-	givedecoration_std 31
+Route110_TrickHouseEnd_EventScript_GiveRedTent:: @ 826AFBF
+	givedecoration DECOR_RED_TENT
 	return
 
-Route110_TrickHouseEnd_EventScript_26AFC7:: @ 826AFC7
-	givedecoration_std 32
+Route110_TrickHouseEnd_EventScript_GiveBlueTent:: @ 826AFC7
+	givedecoration 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
-	call Common_EventScript_NoRoomLeftForAnother
-	msgbox Route110_TrickHouseEnd_Text_26B615, MSGBOX_DEFAULT
+Route110_TrickHouseEnd_EventScript_NoRoomForTent:: @ 826B002
+	call Common_EventScript_NoRoomForDecor
+	msgbox Route110_TrickHouseEnd_Text_NoRoomInPC, MSGBOX_DEFAULT
 	setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1
 	return
 
-Route110_TrickHouseEnd_EventScript_26B015:: @ 826B015
-	applymovement 1, Common_Movement_WalkInPlaceDown
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwaySouth:: @ 826B015
+	applymovement 1, Common_Movement_WalkInPlaceFastestDown
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B020:: @ 826B020
-	applymovement 1, Common_Movement_WalkInPlaceUp
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayNorth:: @ 826B020
+	applymovement 1, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B02B:: @ 826B02B
-	applymovement 1, Common_Movement_WalkInPlaceLeft
+Route110_TrickHouseEnd_EventScript_TrickMasterFaceAwayWest:: @ 826B02B
+	applymovement 1, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-Route110_TrickHouseEnd_EventScript_26B036:: @ 826B036
-	applymovement 1, Common_Movement_WalkInPlaceRight
+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, 3
+	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_WalkInPlaceDown
+	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, 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!$"