Merge branch 'master' into doc-partymenu

21 files changed, 1592 insertions, 1117 deletions

diff --git a/data/scripts/berry_tree.inc b/data/scripts/berry_tree.inc
index 63d1f0bcc..6de5ccf47 100644
--- a/data/scripts/berry_tree.inc
+++ b/data/scripts/berry_tree.inc
@@ -1,16 +1,16 @@
 BerryTreeScript:: @ 82742F9
 	special EventObjectInteractionGetBerryTreeData
 	switch VAR_0x8004
-	case 255, BerryTree_EventScript_27434F
-	case 0, BerryTree_EventScript_CheckSoil
-	case 1, BerryTree_EventScript_CheckBerryStage1
-	case 2, BerryTree_EventScript_CheckBerryStage2
-	case 3, BerryTree_EventScript_CheckBerryStage3
-	case 4, BerryTree_EventScript_CheckBerryStage4
-	case 5, BerryTree_EventScript_CheckBerryFullyGrown
+	case BERRY_STAGE_SPARKLING, BerryTree_EventScript_Sparkling
+	case BERRY_STAGE_NO_BERRY, BerryTree_EventScript_CheckSoil
+	case BERRY_STAGE_PLANTED, BerryTree_EventScript_CheckBerryStage1
+	case BERRY_STAGE_SPROUTED, BerryTree_EventScript_CheckBerryStage2
+	case BERRY_STAGE_TALLER, BerryTree_EventScript_CheckBerryStage3
+	case BERRY_STAGE_FLOWERING, BerryTree_EventScript_CheckBerryStage4
+	case BERRY_STAGE_BERRIES, BerryTree_EventScript_CheckBerryFullyGrown
 	end
 
-BerryTree_EventScript_27434F:: @ 827434F
+BerryTree_EventScript_Sparkling:: @ 827434F
 	lockall
 	message BerryTree_Text_ExclamationPoint
 	waitmessage
@@ -22,7 +22,7 @@ BerryTree_EventScript_CheckSoil:: @ 8274359
 	lock
 	faceplayer
 	specialvar VAR_RESULT, PlayerHasBerries
-	compare VAR_RESULT, 1
+	compare VAR_RESULT, TRUE
 	goto_if_eq BerryTree_EventScript_WantToPlant
 	message BerryTree_Text_ItsSoftLoamySoil
 	waitmessage
@@ -85,6 +85,8 @@ BerryTree_EventScript_CheckBerryStage4:: @ 82743E1
 	waitbuttonpress
 	goto BerryTree_EventScript_WantToWater
 
+@ VAR_0x8005 here is the number of times watered
+@ Buffered by EventObjectInteractionGetBerryTreeData
 BerryTree_EventScript_GetCareAdverb:: @ 82743F6
 	compare VAR_0x8005, 0
 	goto_if_eq BerryTree_EventScript_SetAdverbPoor
@@ -101,6 +103,7 @@ BerryTree_EventScript_SetAdverbPoor:: @ 827441A
 	bufferstring 1, BerryTree_Text_CareAdverbPoor
 	return
 
+@ VAR_0x8006 here is the number of berries
 BerryTree_EventScript_CheckBerryFullyGrown:: @ 8274421
 	buffernumberstring 1, VAR_0x8006
 	lock
@@ -116,7 +119,7 @@ BerryTree_EventScript_PickBerry:: @ 8274448
 	special EventObjectInteractionPickBerryTree
 	compare VAR_0x8004, 0
 	goto_if_eq BerryTree_EventScript_BerryPocketFull
-	special sub_80EED34
+	special IncrementDailyPickedBerries
 	special EventObjectInteractionRemoveBerryTree
 	message BerryTree_Text_PickedTheBerry
 	playfanfare MUS_ME_KINOMI
@@ -143,7 +146,7 @@ BerryTree_EventScript_CancelPickingBerry:: @ 8274479
 	release
 	end
 
-BerryTree_EventScript_274482:: @ 8274482
+BerryTree_EventScript_ItemUsePlantBerry:: @ 8274482
 	lockall
 	special EventObjectInteractionGetBerryTreeData
 	call BerryTree_EventScript_PlantBerry
@@ -165,10 +168,9 @@ BerryTree_EventScript_DontWater:: @ 82744BE
 	releaseall
 	end
 
-BerryTree_EventScript_2744C0:: @ 82744C0
+BerryTree_EventScript_ItemUseWailmerPail:: @ 82744C0
 	special EventObjectInteractionGetBerryTreeData
 	lockall
-
 BerryTree_EventScript_WaterBerry:: @ 82744C4
 	special EventObjectInteractionGetBerryName
 	message BerryTree_Text_WateredTheBerry
@@ -185,7 +187,7 @@ BerryTree_EventScript_WaterBerry:: @ 82744C4
 BerryTree_EventScript_PlantBerry:: @ 82744DD
 	special EventObjectInteractionPlantBerryTree
 	incrementgamestat GAME_STAT_PLANTED_BERRIES
-	special sub_80EED10
+	special IncrementDailyPlantedBerries
 	special EventObjectInteractionGetBerryCountString
 	message BerryTree_Text_PlantedOneBerry
 	waitmessage
diff --git a/data/scripts/flash.inc b/data/scripts/flash.inc
new file mode 100644
index 000000000..916b50719
--- /dev/null
+++ b/data/scripts/flash.inc
@@ -0,0 +1,4 @@
+EventScript_FldEffFlash:: @ 82926F8
+	animateflash 1
+	setflashradius 1
+	end
diff --git a/data/scripts/gabby_and_ty.inc b/data/scripts/gabby_and_ty.inc
index 0f8d71f6b..7ed366aca 100644
--- a/data/scripts/gabby_and_ty.inc
+++ b/data/scripts/gabby_and_ty.inc
@@ -1,337 +1,332 @@
+@ Unused
 EventScript_28CCAA:: @ 828CCAA
 	setvar VAR_0x8005, 8
 	special InterviewBefore
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_28CCC6
+	goto_if_eq EventScript_UnusedRet
 	setvar VAR_0x8005, 8
 	special InterviewAfter
 	return
 
-EventScript_28CCC6:: @ 828CCC6
+EventScript_UnusedRet:: @ 828CCC6
 	return
 
-Route111_EventScript_28CCC7:: @ 828CCC7
-Route118_EventScript_28CCC7:: @ 828CCC7
-Route120_EventScript_28CCC7:: @ 828CCC7
+@ Gabby and Ty always move to the same spots for the first 5 battles
+@ From the 6th battle onwards, they move randomly between locations 6-8
+GabbyAndTy_EventScript_UpdateLocation:: @ 828CCC7
 	cleartrainerflag TRAINER_GABBY_AND_TY_6
 	specialvar VAR_RESULT, GabbyAndTyGetBattleNum
 	switch VAR_RESULT
-	case 0, Route111_EventScript_28CD38
-	case 1, Route111_EventScript_28CD3E
-	case 2, Route111_EventScript_28CD49
-	case 3, Route111_EventScript_28CD54
-	case 4, Route111_EventScript_28CD5F
-	case 5, Route111_EventScript_28CD6A
-	case 6, Route111_EventScript_28CD75
-	case 7, Route111_EventScript_28CD80
-	case 8, Route111_EventScript_28CD8B
+	case 0, GabbyAndTy_EventScript_MoveForBattle1
+	case 1, GabbyAndTy_EventScript_MoveForBattle2
+	case 2, GabbyAndTy_EventScript_MoveForBattle3
+	case 3, GabbyAndTy_EventScript_MoveForBattle4
+	case 4, GabbyAndTy_EventScript_MoveForBattle5
+	case 5, GabbyAndTy_EventScript_MoveForBattle6
+	case 6, GabbyAndTy_EventScript_MoveForBattle7
+	case 7, GabbyAndTy_EventScript_MoveForBattle8
+	case 8, GabbyAndTy_EventScript_MoveForBattle9
 	end
 
-Route111_EventScript_28CD38:: @ 828CD38
-	call Route111_EventScript_28CD9A
+GabbyAndTy_EventScript_MoveForBattle1:: @ 828CD38
+	call GabbyAndTy_EventScript_ShowAtRoute111_1
 	return
 
-Route111_EventScript_28CD3E:: @ 828CD3E
-	call Route111_EventScript_28CDA2
-	call Route111_EventScript_28CD96
+GabbyAndTy_EventScript_MoveForBattle2:: @ 828CD3E
+	call GabbyAndTy_EventScript_ShowAtRoute118_1
+	call GabbyAndTy_EventScript_HideAtRoute111_1
 	return
 
-Route111_EventScript_28CD49:: @ 828CD49
-	call Route111_EventScript_28CDAA
-	call Route111_EventScript_28CD9E
+GabbyAndTy_EventScript_MoveForBattle3:: @ 828CD49
+	call GabbyAndTy_EventScript_ShowAtRoute120_1
+	call GabbyAndTy_EventScript_HideAtRoute118_1
 	return
 
-Route111_EventScript_28CD54:: @ 828CD54
-	call Route111_EventScript_28CDB2
-	call Route111_EventScript_28CDA6
+GabbyAndTy_EventScript_MoveForBattle4:: @ 828CD54
+	call GabbyAndTy_EventScript_ShowAtRoute111_3
+	call GabbyAndTy_EventScript_HideAtRoute120_1
 	return
 
-Route111_EventScript_28CD5F:: @ 828CD5F
-	call Route111_EventScript_28CDBA
-	call Route111_EventScript_28CDAE
+GabbyAndTy_EventScript_MoveForBattle5:: @ 828CD5F
+	call GabbyAndTy_EventScript_ShowAtRoute118_2
+	call GabbyAndTy_EventScript_HideAtRoute111_3
 	return
 
-Route111_EventScript_28CD6A:: @ 828CD6A
-	call Route111_EventScript_28CDC2
-	call Route111_EventScript_28CDB6
+GabbyAndTy_EventScript_MoveForBattle6:: @ 828CD6A
+	call GabbyAndTy_EventScript_ShowAtRoute120_2
+	call GabbyAndTy_EventScript_HideAtRoute118_2
 	return
 
-Route111_EventScript_28CD75:: @ 828CD75
-	call Route111_EventScript_28CDCA
-	call Route111_EventScript_28CDBE
+GabbyAndTy_EventScript_MoveForBattle7:: @ 828CD75
+	call GabbyAndTy_EventScript_ShowAtRoute111_2
+	call GabbyAndTy_EventScript_HideAtRoute120_2
 	return
 
-Route111_EventScript_28CD80:: @ 828CD80
-	call Route111_EventScript_28CDD2
-	call Route111_EventScript_28CDC6
+GabbyAndTy_EventScript_MoveForBattle8:: @ 828CD80
+	call GabbyAndTy_EventScript_ShowAtRoute118_3
+	call GabbyAndTy_EventScript_HideAtRoute111_2
 	return
 
-Route111_EventScript_28CD8B:: @ 828CD8B
-	call Route111_EventScript_28CDC2
-	call Route111_EventScript_28CDCE
+GabbyAndTy_EventScript_MoveForBattle9:: @ 828CD8B
+	call GabbyAndTy_EventScript_ShowAtRoute120_2
+	call GabbyAndTy_EventScript_HideAtRoute118_3
 	return
 
-Route111_EventScript_28CD96:: @ 828CD96
+GabbyAndTy_EventScript_HideAtRoute111_1:: @ 828CD96
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CD9A:: @ 828CD9A
+GabbyAndTy_EventScript_ShowAtRoute111_1:: @ 828CD9A
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CD9E:: @ 828CD9E
+GabbyAndTy_EventScript_HideAtRoute118_1:: @ 828CD9E
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CDA2:: @ 828CDA2
+GabbyAndTy_EventScript_ShowAtRoute118_1:: @ 828CDA2
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CDA6:: @ 828CDA6
+GabbyAndTy_EventScript_HideAtRoute120_1:: @ 828CDA6
 	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CDAA:: @ 828CDAA
+GabbyAndTy_EventScript_ShowAtRoute120_1:: @ 828CDAA
 	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_1
 	return
 
-Route111_EventScript_28CDAE:: @ 828CDAE
+GabbyAndTy_EventScript_HideAtRoute111_3:: @ 828CDAE
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
-Route111_EventScript_28CDB2:: @ 828CDB2
+GabbyAndTy_EventScript_ShowAtRoute111_3:: @ 828CDB2
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_3
 	return
 
-Route111_EventScript_28CDB6:: @ 828CDB6
+GabbyAndTy_EventScript_HideAtRoute118_2:: @ 828CDB6
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDBA:: @ 828CDBA
+GabbyAndTy_EventScript_ShowAtRoute118_2:: @ 828CDBA
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDBE:: @ 828CDBE
+GabbyAndTy_EventScript_HideAtRoute120_2:: @ 828CDBE
 	setflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDC2:: @ 828CDC2
+GabbyAndTy_EventScript_ShowAtRoute120_2:: @ 828CDC2
 	clearflag FLAG_HIDE_ROUTE_120_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDC6:: @ 828CDC6
+GabbyAndTy_EventScript_HideAtRoute111_2:: @ 828CDC6
 	setflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDCA:: @ 828CDCA
+GabbyAndTy_EventScript_ShowAtRoute111_2:: @ 828CDCA
 	clearflag FLAG_HIDE_ROUTE_111_GABBY_AND_TY_2
 	return
 
-Route111_EventScript_28CDCE:: @ 828CDCE
+GabbyAndTy_EventScript_HideAtRoute118_3:: @ 828CDCE
 	setflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
-Route111_EventScript_28CDD2:: @ 828CDD2
+GabbyAndTy_EventScript_ShowAtRoute118_3:: @ 828CDD2
 	clearflag FLAG_HIDE_ROUTE_118_GABBY_AND_TY_3
 	return
 
-Route111_EventScript_28CDD6:: @ 828CDD6
-	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28AF05, Route111_Text_28B000, Route111_Text_28B5EC, Route111_EventScript_28CF56
-	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_GabbyBattle1:: @ 828CDD6
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_GabbyPreFirstBattle, GabbyAndTy_Text_GabbyDefeatFirstTime, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CDF6:: @ 828CDF6
-	trainerbattle_double TRAINER_GABBY_AND_TY_1, Route111_Text_28B75C, Route111_Text_28B8B1, Route111_Text_28B841, Route111_EventScript_28CF56
-	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_TyBattle1:: @ 828CDF6
+	trainerbattle_double TRAINER_GABBY_AND_TY_1, GabbyAndTy_Text_TyPreFirstBattle, GabbyAndTy_Text_TyDefeatFirstTime, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_FirstInterview
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_28CE16:: @ 828CE16
-	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
-	msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_GabbyBattle2:: @ 828CE16
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_28CE36:: @ 828CE36
-	trainerbattle_double TRAINER_GABBY_AND_TY_2, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
-	msgbox Route118_Text_28B805, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_TyBattle2:: @ 828CE36
+	trainerbattle_double TRAINER_GABBY_AND_TY_2, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_28CE56:: @ 828CE56
-	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28AF7D, Route120_Text_28B719, Route120_Text_28B5EC, Route120_EventScript_28CFC3
-	msgbox Route120_Text_28B5C0, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_GabbyBattle3:: @ 828CE56
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route120_EventScript_28CE76:: @ 828CE76
-	trainerbattle_double TRAINER_GABBY_AND_TY_3, Route120_Text_28B7B1, Route120_Text_28B8F6, Route120_Text_28B841, Route120_EventScript_28CFC3
-	msgbox Route120_Text_28B805, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_TyBattle3:: @ 828CE76
+	trainerbattle_double TRAINER_GABBY_AND_TY_3, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CE96:: @ 828CE96
-	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
-	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_GabbyBattle4:: @ 828CE96
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CEB6:: @ 828CEB6
-	trainerbattle_double TRAINER_GABBY_AND_TY_4, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
-	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_TyBattle4:: @ 828CEB6
+	trainerbattle_double TRAINER_GABBY_AND_TY_4, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_28CED6:: @ 828CED6
-	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28AF7D, Route118_Text_28B719, Route118_Text_28B5EC, Route118_EventScript_28CFC3
-	msgbox Route118_Text_28B5C0, MSGBOX_DEFAULT
+Route118_EventScript_GabbyBattle5:: @ 828CED6
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route118_EventScript_28CEF6:: @ 828CEF6
-	trainerbattle_double TRAINER_GABBY_AND_TY_5, Route118_Text_28B7B1, Route118_Text_28B8F6, Route118_Text_28B841, Route118_EventScript_28CFC3
-	msgbox Route118_Text_28B805, MSGBOX_DEFAULT
+Route118_EventScript_TyBattle5:: @ 828CEF6
+	trainerbattle_double TRAINER_GABBY_AND_TY_5, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CF16:: @ 828CF16
-Route118_EventScript_28CF16:: @ 828CF16
-Route120_EventScript_28CF16:: @ 828CF16
-	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28AF7D, Route111_Text_28B719, Route111_Text_28B5EC, Route111_EventScript_28CFC3
-	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_GabbyBattle6:: @ 828CF16
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_GabbyPreBattle, GabbyAndTy_Text_GabbyDefeat, GabbyAndTy_Text_GabbyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CF36:: @ 828CF36
-Route118_EventScript_28CF36:: @ 828CF36
-Route120_EventScript_28CF36:: @ 828CF36
-	trainerbattle_double TRAINER_GABBY_AND_TY_6, Route111_Text_28B7B1, Route111_Text_28B8F6, Route111_Text_28B841, Route111_EventScript_28CFC3
-	msgbox Route111_Text_28B805, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_TyBattle6:: @ 828CF36
+	trainerbattle_double TRAINER_GABBY_AND_TY_6, GabbyAndTy_Text_TyPreBattle, GabbyAndTy_Text_TyDefeat, GabbyAndTy_Text_TyNotEnoughMons, GabbyAndTy_EventScript_RequestInterview
+	msgbox GabbyAndTy_Text_TyPostBattle, MSGBOX_DEFAULT
 	release
 	end
 
-Route111_EventScript_28CF56:: @ 828CF56
+GabbyAndTy_EventScript_FirstInterview:: @ 828CF56
 	special GabbyAndTyBeforeInterview
 	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route111_EventScript_28CF94
+	call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route111_EventScript_28CF9F
+	call_if_eq GabbyAndTy_EventScript_FacePlayerSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route111_EventScript_28CFB1
-	goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
-	msgbox Route111_Text_28B042, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+	call_if_eq GabbyAndTy_EventScript_FacePlayerEast
+	goto_if_set FLAG_TEMP_1, GabbyAndTy_EventScript_KeepingAnEyeOutForYou
+	msgbox GabbyAndTy_Text_WhoAreYouInterview, MSGBOX_YESNO
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28CF94:: @ 828CF94
-	applymovement VAR_0x8004, Route111_Movement_28D04D
+GabbyAndTy_EventScript_FacePlayerNorth:: @ 828CF94
+	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceDown
 	waitmovement 0
 	return
 
-Route111_EventScript_28CF9F:: @ 828CF9F
-	applymovement VAR_0x8004, Route111_Movement_28D04F
+GabbyAndTy_EventScript_FacePlayerSouth:: @ 828CF9F
+	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceUp
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	return
 
-Route111_EventScript_28CFB1:: @ 828CFB1
-	applymovement VAR_0x8004, Route111_Movement_28D051
+GabbyAndTy_EventScript_FacePlayerEast:: @ 828CFB1
+	applymovement VAR_0x8004, GabbyAndTy_Movement_WalkInPlaceLeft
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-Route111_EventScript_28CFC3:: @ 828CFC3
-Route118_EventScript_28CFC3:: @ 828CFC3
-Route120_EventScript_28CFC3:: @ 828CFC3
+GabbyAndTy_EventScript_RequestInterview:: @ 828CFC3
 	special GabbyAndTyBeforeInterview
 	special GabbyAndTySetScriptVarsToEventObjectLocalIds
 	compare VAR_FACING, DIR_NORTH
-	call_if_eq Route111_EventScript_28CF94
+	call_if_eq GabbyAndTy_EventScript_FacePlayerNorth
 	compare VAR_FACING, DIR_SOUTH
-	call_if_eq Route111_EventScript_28CF9F
+	call_if_eq GabbyAndTy_EventScript_FacePlayerSouth
 	compare VAR_FACING, DIR_EAST
-	call_if_eq Route111_EventScript_28CFB1
-	goto_if_set FLAG_TEMP_1, Route111_EventScript_28D0EE
+	call_if_eq GabbyAndTy_EventScript_FacePlayerEast
+	goto_if_set FLAG_TEMP_1, GabbyAndTy_EventScript_KeepingAnEyeOutForYou
 	specialvar VAR_RESULT, GabbyAndTyGetLastQuote
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_28D053
-	msgbox Route111_Text_28B137, MSGBOX_DEFAULT
+	goto_if_eq GabbyAndTy_EventScript_DidntInterviewLastTime
+	msgbox GabbyAndTy_Text_QuoteFromLastInterview, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia
 	switch VAR_RESULT
-	case 0, Route111_EventScript_28D061
-	case 1, Route111_EventScript_28D06F
-	case 2, Route111_EventScript_28D07D
-	case 3, Route111_EventScript_28D08B
-	case 4, Route111_EventScript_28D099
+	case 0, GabbyAndTy_EventScript_RequestInterviewNoTrivia
+	case 1, GabbyAndTy_EventScript_RequestInterviewShortBattle
+	case 2, GabbyAndTy_EventScript_RequestInterviewThrewBall
+	case 3, GabbyAndTy_EventScript_RequestInterviewUsedItems
+	case 4, GabbyAndTy_EventScript_RequestInterviewLostAMon
 	end
 
-Route111_Movement_28D04D: @ 828D04D
+GabbyAndTy_Movement_WalkInPlaceDown: @ 828D04D
 	walk_in_place_down
 	step_end
 
-Route111_Movement_28D04F: @ 828D04F
+GabbyAndTy_Movement_WalkInPlaceUp: @ 828D04F
 	walk_in_place_up
 	step_end
 
-Route111_Movement_28D051: @ 828D051
+GabbyAndTy_Movement_WalkInPlaceLeft: @ 828D051
 	walk_in_place_left
 	step_end
 
-Route111_EventScript_28D053:: @ 828D053
-	msgbox Route111_Text_28B62D, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+GabbyAndTy_EventScript_DidntInterviewLastTime:: @ 828D053
+	msgbox GabbyAndTy_Text_GiveUsAnInterviewThisTime, MSGBOX_YESNO
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D061:: @ 828D061
-	msgbox Route111_Text_28B3F3, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+GabbyAndTy_EventScript_RequestInterviewNoTrivia:: @ 828D061
+	msgbox GabbyAndTy_Text_InterviewAgain, MSGBOX_YESNO
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D06F:: @ 828D06F
-	msgbox Route111_Text_28B1B3, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+GabbyAndTy_EventScript_RequestInterviewShortBattle:: @ 828D06F
+	msgbox GabbyAndTy_Text_YouStompedUsInterviewAgain, MSGBOX_YESNO
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D07D:: @ 828D07D
-	msgbox Route111_Text_28B23D, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+GabbyAndTy_EventScript_RequestInterviewThrewBall:: @ 828D07D
+	msgbox GabbyAndTy_Text_YouThrewABallAtUsInterviewAgain, MSGBOX_YESNO
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D08B:: @ 828D08B
-	msgbox Route111_Text_28B2FA, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+GabbyAndTy_EventScript_RequestInterviewUsedItems:: @ 828D08B
+	msgbox GabbyAndTy_Text_CleverItemSkillsInterviewAgain, MSGBOX_YESNO
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D099:: @ 828D099
-	msgbox Route111_Text_28B379, MSGBOX_YESNO
-	goto Route111_EventScript_28D0A7
+GabbyAndTy_EventScript_RequestInterviewLostAMon:: @ 828D099
+	msgbox GabbyAndTy_Text_WeLookedRespectableInterviewAgain, MSGBOX_YESNO
+	goto GabbyAndTy_EventScript_Interview
 	end
 
-Route111_EventScript_28D0A7:: @ 828D0A7
+GabbyAndTy_EventScript_Interview:: @ 828D0A7
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_28D0E1
-	msgbox Route111_Text_28B433, MSGBOX_DEFAULT
+	goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut
+	msgbox GabbyAndTy_Text_DescribeYourFeelings, MSGBOX_DEFAULT
 	setvar VAR_0x8004, EASY_CHAT_TYPE_GABBY_AND_TY
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq Route111_EventScript_28D0E1
-	msgbox Route111_Text_28B4AB, MSGBOX_DEFAULT
+	goto_if_eq GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut
+	msgbox GabbyAndTy_Text_PerfectWellBeSeeingYou, MSGBOX_DEFAULT
 	special GabbyAndTyAfterInterview
 	setflag FLAG_TEMP_1
 	release
 	end
 
-Route111_EventScript_28D0E1:: @ 828D0E1
-	msgbox Route111_Text_28B577, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_DontGiveUpKeepingEyeOut:: @ 828D0E1
+	msgbox GabbyAndTy_Text_DontGiveUpKeepingEyeOut, MSGBOX_DEFAULT
 	setflag FLAG_TEMP_1
 	release
 	end
 
-Route111_EventScript_28D0EE:: @ 828D0EE
-	msgbox Route111_Text_28B5C0, MSGBOX_DEFAULT
+GabbyAndTy_EventScript_KeepingAnEyeOutForYou:: @ 828D0EE
+	msgbox GabbyAndTy_Text_KeepingAnEyeOutForYou, MSGBOX_DEFAULT
 	release
 	end
diff --git a/data/scripts/lilycove_lady.inc b/data/scripts/lilycove_lady.inc
index 77b842d3d..5f6621fa3 100644
--- a/data/scripts/lilycove_lady.inc
+++ b/data/scripts/lilycove_lady.inc
@@ -1,455 +1,453 @@
-LilycoveCity_PokemonCenter_1F_EventScript_2A836B:: @ 82A836B
+LilycoveCity_PokemonCenter_1F_EventScript_LilycoveLady:: @ 82A836B
     special Script_GetLilycoveLadyId
     switch VAR_RESULT
-    case LILYCOVE_LADY_QUIZ, LilycoveCity_PokemonCenter_1F_EventScript_2A8554
-    case LILYCOVE_LADY_FAVOR, LilycoveCity_PokemonCenter_1F_EventScript_2A8395
-    case LILYCOVE_LADY_CONTEST, LilycoveCity_PokemonCenter_1F_EventScript_2A882A
+    case LILYCOVE_LADY_QUIZ, LilycoveCity_PokemonCenter_1F_EventScript_QuizLady
+    case LILYCOVE_LADY_FAVOR, LilycoveCity_PokemonCenter_1F_EventScript_FavorLady
+    case LILYCOVE_LADY_CONTEST, LilycoveCity_PokemonCenter_1F_EventScript_ContestLady
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8395:: @ 82A8395
+LilycoveCity_PokemonCenter_1F_EventScript_FavorLady:: @ 82A8395
     lock
     faceplayer
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A69, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady, MSGBOX_DEFAULT
     specialvar VAR_RESULT, GetFavorLadyState
     compare VAR_RESULT, LILYCOVE_LADY_STATE_READY
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83D0
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady
     compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83C6
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted
     compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8510
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A83C6:: @ 82A83C6
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8AB1, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyCompleted:: @ 82A83C6
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A83D0:: @ 82A83D0
+LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyReady:: @ 82A83D0
     special BufferFavorLadyRequest
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8A7D, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing, MSGBOX_DEFAULT
     specialvar VAR_RESULT, HasAnotherPlayerGivenFavorLadyItem
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8435
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A83F7
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_RequestItem
+    compare VAR_RESULT, TRUE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A83F7:: @ 82A83F7
+LilycoveCity_PokemonCenter_1F_EventScript_TellAboutPlayersItem:: @ 82A83F7
     special BufferFavorLadyItemName
     special BufferFavorLadyPlayerName
     specialvar VAR_RESULT, DidFavorLadyLikeItem
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8419
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8427
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveBadThing
+    compare VAR_RESULT, TRUE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8419:: @ 82A8419
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8ACE, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435
+LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveBadThing:: @ 82A8419
+    msgbox LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_RequestItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8427:: @ 82A8427
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B36, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8435
+LilycoveCity_PokemonCenter_1F_EventScript_PlayerGaveGreatThing:: @ 82A8427
+    msgbox LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_RequestItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8435:: @ 82A8435
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8B69, MSGBOX_YESNO
+LilycoveCity_PokemonCenter_1F_EventScript_RequestItem:: @ 82A8435
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing, MSGBOX_YESNO
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A845E
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8454:: @ 82A8454
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BCD, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor:: @ 82A8454
+    msgbox LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A845E:: @ 82A845E
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BAD, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A846C
+LilycoveCity_PokemonCenter_1F_EventScript_AcceptFavor:: @ 82A845E
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A846C:: @ 82A846C
+LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem:: @ 82A846C
     fadescreen 1
     setvar VAR_RESULT, 0
     special Script_FavorLadyOpenBagMenu
     waitstate
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A848E
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84AD
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A848E:: @ 82A848E
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8BEE, MSGBOX_YESNO
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChooseFavorItem:: @ 82A848E
+    msgbox LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare, MSGBOX_YESNO
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8454
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineFavor
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A846C
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChooseFavorItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A84AD:: @ 82A84AD
+LilycoveCity_PokemonCenter_1F_EventScript_GiveFavorItem:: @ 82A84AD
     specialvar VAR_RESULT, Script_DoesFavorLadyLikeItem
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84C9
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84D6
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem
+    compare VAR_RESULT, TRUE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A84C9:: @ 82A84C9
+LilycoveCity_PokemonCenter_1F_EventScript_DidntLikeFavorItem:: @ 82A84C9
     special BufferFavorLadyRequest
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C0F, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A84D6:: @ 82A84D6
+LilycoveCity_PokemonCenter_1F_EventScript_CheckLovedItem:: @ 82A84D6
     specialvar VAR_RESULT, IsFavorLadyThresholdMet
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84F2
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A84FF
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem
+    compare VAR_RESULT, TRUE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A84F2:: @ 82A84F2
+LilycoveCity_PokemonCenter_1F_EventScript_LikedFavorItem:: @ 82A84F2
     special BufferFavorLadyRequest
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8C6F, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A84FF:: @ 82A84FF
+LilycoveCity_PokemonCenter_1F_EventScript_LovedFavorItem:: @ 82A84FF
     special BufferFavorLadyRequest
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8CC8, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8510
+    msgbox LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8510:: @ 82A8510
+LilycoveCity_PokemonCenter_1F_EventScript_FavorLadyPrize:: @ 82A8510
     setvar VAR_0x8004, 0
     specialvar VAR_0x8004, FavorLadyGetPrize
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8D5D, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn, MSGBOX_DEFAULT
     giveitem_std VAR_0x8004
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8545
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A854F
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8545:: @ 82A8545
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8DBD, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_NoRoomForFavorPrize:: @ 82A8545
+    msgbox LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A854F:: @ 82A854F
+LilycoveCity_PokemonCenter_1F_EventScript_ReceivedFavorPrize:: @ 82A854F
     special SetFavorLadyState_Complete
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8554:: @ 82A8554
+LilycoveCity_PokemonCenter_1F_EventScript_QuizLady:: @ 82A8554
     lock
     faceplayer
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E2B, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady, MSGBOX_DEFAULT
     specialvar VAR_RESULT, GetQuizLadyState
     compare VAR_RESULT, LILYCOVE_LADY_STATE_READY
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8585
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz
     compare VAR_RESULT, LILYCOVE_LADY_STATE_COMPLETED
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85AC
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz
     compare VAR_RESULT, LILYCOVE_LADY_STATE_PRIZE
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86EC
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8585:: @ 82A8585
+LilycoveCity_PokemonCenter_1F_EventScript_HasQuiz:: @ 82A8585
     specialvar VAR_RESULT, GetQuizAuthor
     compare VAR_RESULT, QUIZ_AUTHOR_PLAYER
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz
     compare VAR_RESULT, QUIZ_AUTHOR_OTHER_PLAYER
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85D2
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady
     compare VAR_RESULT, QUIZ_AUTHOR_LADY
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85E0
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A85AC:: @ 82A85AC
+LilycoveCity_PokemonCenter_1F_EventScript_CheckMadeQuiz:: @ 82A85AC
     specialvar VAR_RESULT, IsQuizLadyWaitingForChallenger
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8759
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A85C8
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
+    compare VAR_RESULT, TRUE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A85C8:: @ 82A85C8
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8E4E, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_WaitingToTakeYourQuiz:: @ 82A85C8
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A85D2:: @ 82A85D2
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE
+LilycoveCity_PokemonCenter_1F_EventScript_PlayerQuizReady:: @ 82A85D2
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A85E0:: @ 82A85E0
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EAC, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A85EE
+LilycoveCity_PokemonCenter_1F_EventScript_LadyQuizReady:: @ 82A85E0
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A85EE:: @ 82A85EE
+LilycoveCity_PokemonCenter_1F_EventScript_AskTakeQuiz:: @ 82A85EE
     setvar VAR_0x8004, 0
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8EEC, MSGBOX_YESNO
+    msgbox LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge, MSGBOX_YESNO
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8612
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8612:: @ 82A8612
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F65, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_DeclineQuiz:: @ 82A8612
+    msgbox LilycoveCity_PokemonCenter_1F_Text_HowBoringBye, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A861C:: @ 82A861C
+LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz:: @ 82A861C
     special ClearQuizLadyPlayerAnswer
     compare VAR_0x8004, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A864C
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion
     compare VAR_0x8004, EASY_CHAT_TYPE_QUIZ_ANSWER
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8656
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8635:: @ 82A8635
+LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState:: @ 82A8635
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8660
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8689
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A864C:: @ 82A864C
+LilycoveCity_PokemonCenter_1F_EventScript_ShowQuestion:: @ 82A864C
     special QuizLadyShowQuizQuestion
     waitstate
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635
+    goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8656:: @ 82A8656
+LilycoveCity_PokemonCenter_1F_EventScript_GetAnswer:: @ 82A8656
     special QuizLadyGetPlayerAnswer
     waitstate
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8635
+    goto LilycoveCity_PokemonCenter_1F_EventScript_CheckQuizTakingState
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8660:: @ 82A8660
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F7E, MSGBOX_YESNO
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitQuiz:: @ 82A8660
+    msgbox LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit, MSGBOX_YESNO
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A867F
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A861C
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_TakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A867F:: @ 82A867F
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F9A, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_QuitTakingQuiz:: @ 82A867F
+    msgbox LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8689:: @ 82A8689
+LilycoveCity_PokemonCenter_1F_EventScript_SubmitQuizResponse:: @ 82A8689
     special SetQuizLadyState_Complete
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8F4D, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer, MSGBOX_DEFAULT
     specialvar VAR_RESULT, IsQuizAnswerCorrect
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86C7
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A86B0
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse
+    compare VAR_RESULT, TRUE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A86B0:: @ 82A86B0
+LilycoveCity_PokemonCenter_1F_EventScript_CorrectResponse:: @ 82A86B0
     playse SE_SEIKAI
     delay 10
     playse SE_SEIKAI
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A8FC7, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A86EC
+    msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRight, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A86C7:: @ 82A86C7
+LilycoveCity_PokemonCenter_1F_EventScript_IncorrectResponse:: @ 82A86C7
     special BufferQuizCorrectAnswer
     special BufferQuizPrizeName
     playse SE_HAZURE
     delay 10
     playse SE_HAZURE
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A90A5, MSGBOX_DEFAULT
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A90CD, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
     end
 
 @ VAR_RESULT is essentially ignored, both jumps are identical
-LilycoveCity_PokemonCenter_1F_EventScript_2A86EC:: @ 82A86EC
+LilycoveCity_PokemonCenter_1F_EventScript_ReadyGivePrize:: @ 82A86EC
     specialvar VAR_RESULT, BufferQuizAuthorNameAndCheckIfLady
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8708
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8716
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8708:: @ 82A8708
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724
+LilycoveCity_PokemonCenter_1F_EventScript_GivePrize1:: @ 82A8708
+    msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_GivePrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8716:: @ 82A8716
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9007, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8724
+LilycoveCity_PokemonCenter_1F_EventScript_GivePrize0:: @ 82A8716
+    msgbox LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_GivePrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8724:: @ 82A8724
+LilycoveCity_PokemonCenter_1F_EventScript_GivePrize:: @ 82A8724
     setvar VAR_0x8005, 0
     special BufferQuizPrizeItem
     special SetQuizLadyState_Complete
     giveitem_std VAR_0x8005
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A874C
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8759
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize
+    goto LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A874C:: @ 82A874C
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A906A, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_NoSpaceForQuizPrize:: @ 82A874C
+    msgbox LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp, MSGBOX_DEFAULT
     special SetQuizLadyState_GivePrize
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8759:: @ 82A8759
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A90FB, MSGBOX_YESNO
+LilycoveCity_PokemonCenter_1F_EventScript_AskMakeQuiz:: @ 82A8759
+    msgbox LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz, MSGBOX_YESNO
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8785
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8778:: @ 82A8778
+LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz:: @ 82A8778
     special QuizLadyPickNewQuestion
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9131, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8785:: @ 82A8785
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9153, MSGBOX_DEFAULT
-
-LilycoveCity_PokemonCenter_1F_EventScript_2A878D:: @ 82A878D
+LilycoveCity_PokemonCenter_1F_EventScript_MakeQuiz:: @ 82A8785
+    msgbox LilycoveCity_PokemonCenter_1F_Text_PickYourPrize, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_PickPrize:: @ 82A878D
     fadescreen 1
     setvar VAR_RESULT, 0
     special Script_QuizLadyOpenBagMenu
     waitstate
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87AF
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87CE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A87AF:: @ 82A87AF
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9212, MSGBOX_YESNO
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitChoosingPrize:: @ 82A87AF
+    msgbox LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize, MSGBOX_YESNO
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A878D
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_PickPrize
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A87CE:: @ 82A87CE
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9270, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_WriteQuiz:: @ 82A87CE
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz, MSGBOX_DEFAULT
     special ClearQuizLadyQuestionAndAnswer
     special ClearQuizLadyPlayerAnswer
     setvar VAR_0x8004, EASY_CHAT_TYPE_QUIZ_QUESTION
-
-LilycoveCity_PokemonCenter_1F_EventScript_2A87E1:: @ 82A87E1
+LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion:: @ 82A87E1
     fadescreen 1
     special QuizLadySetCustomQuestion
     waitstate
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87F8
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A8817
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion
+    goto LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A87F8:: @ 82A87F8
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A92D3, MSGBOX_YESNO
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitWritingQuizQuestion:: @ 82A87F8
+    msgbox LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion, MSGBOX_YESNO
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8778
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineMakeQuiz
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A87E1
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_WriteQuizQuestion
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8817:: @ 82A8817
+LilycoveCity_PokemonCenter_1F_EventScript_FinishMakingQuiz:: @ 82A8817
     special QuizLadyTakePrizeForCustomQuiz
     special QuizLadyRecordCustomQuizData
     special QuizLadySetWaitingForChallenger
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9336, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A882A:: @ 82A882A
+LilycoveCity_PokemonCenter_1F_EventScript_ContestLady:: @ 82A882A
     lock
     faceplayer
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A93A7, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady, MSGBOX_DEFAULT
     specialvar VAR_RESULT, HasPlayerGivenContestLadyPokeblock
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8850
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock
+    compare VAR_RESULT, TRUE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock
     end
 
-@ Redundant with above script, VAR_RESULT will always be 0 here
-LilycoveCity_PokemonCenter_1F_EventScript_2A8850:: @ 82A8850
+@ Redundant with above script, VAR_RESULT will always be FALSE here
+LilycoveCity_PokemonCenter_1F_EventScript_NotGivenPokeblock:: @ 82A8850
     specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8876
-    compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A886C
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock
+    compare VAR_RESULT, TRUE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A886C:: @ 82A886C
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A93D6, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_GivenPokeblock:: @ 82A886C
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8876:: @ 82A8876
+LilycoveCity_PokemonCenter_1F_EventScript_AskForPokeblock:: @ 82A8876
     special Script_BufferContestLadyCategoryAndMonName
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A93F4, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality, MSGBOX_DEFAULT
     checkitem ITEM_POKEBLOCK_CASE, 1
+    compare VAR_RESULT, FALSE
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase
+    msgbox LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock, MSGBOX_YESNO
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89AE
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A94E8, MSGBOX_YESNO
-    compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A88B0:: @ 82A88B0
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9556, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock:: @ 82A88B0
+    msgbox LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A88BA:: @ 82A88BA
+LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock:: @ 82A88BA
     fadescreen 1
     special OpenPokeblockCaseForContestLady
     waitstate
     compare VAR_RESULT, 0xFFFF
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88D7
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock
     compare VAR_RESULT, 0xFFFF
-    goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_2A88F6
+    goto_if_ne LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A88D7:: @ 82A88D7
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9537, MSGBOX_YESNO
+LilycoveCity_PokemonCenter_1F_EventScript_AskQuitGivingPokeblock:: @ 82A88D7
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock, MSGBOX_YESNO
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88B0
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_DeclineGivePokeblock
     compare VAR_RESULT, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A88BA
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_ChoosePokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A88F6:: @ 82A88F6
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9571, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_GivePokeblock:: @ 82A88F6
+    msgbox LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock, MSGBOX_DEFAULT
     special SetContestLadyGivenPokeblock
     special GetContestLadyMonSpecies
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A890A
+    goto LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock
     end
 
 @ VAR_0x8004 here is the return value from GivePokeblockToContestLady
-LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A
-    applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89B8
+LilycoveCity_PokemonCenter_1F_EventScript_FeedPokeblock:: @ 82A890A
+    applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon
     waitmovement 0
     delay 60
-    applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89BB
+    applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady
     waitmovement 0
     delay 60
     waitse
@@ -457,194 +455,194 @@ LilycoveCity_PokemonCenter_1F_EventScript_2A890A:: @ 82A890A
     delay 120
     waitmoncry
     compare VAR_0x8004, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A893F
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A894C
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock
+    goto LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A893F:: @ 82A893F
-    applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_2A89C2
+@ VAR_0x8004 here is the return value from GivePokeblockToContestLady
+LilycoveCity_PokemonCenter_1F_EventScript_MonEnjoyPokeblock:: @ 82A893F
+    applymovement 5, LilycoveCity_PokemonCenter_1F_Movement_MonJump
     waitmovement 0
     delay 60
-
-@ VAR_0x8004 here is the return value from GivePokeblockToContestLady
-LilycoveCity_PokemonCenter_1F_EventScript_2A894C:: @ 82A894C
-    applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_2A89C0
+LilycoveCity_PokemonCenter_1F_EventScript_FinishFeedPokeblock:: @ 82A894C
+    applymovement 4, LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer
     waitmovement 0
     delay 60
     compare VAR_0x8004, 0
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8970
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock
     compare VAR_0x8004, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A897E
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8970:: @ 82A8970
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A95AD, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F
+LilycoveCity_PokemonCenter_1F_EventScript_MonDislikedPokeblock:: @ 82A8970
+    msgbox LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A897E:: @ 82A897E
+LilycoveCity_PokemonCenter_1F_EventScript_MonLikedPokeblock:: @ 82A897E
     special Script_BufferContestLadyCategoryAndMonName
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9605, MSGBOX_DEFAULT
-    goto LilycoveCity_PokemonCenter_1F_EventScript_2A898F
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks, MSGBOX_DEFAULT
+    goto LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A898F:: @ 82A898F
+LilycoveCity_PokemonCenter_1F_EventScript_CheckAirContestLadyShow:: @ 82A898F
     specialvar VAR_RESULT, ShouldContestLadyShowGoOnAir
     compare VAR_RESULT, 1
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A89A1
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A89A1:: @ 82A89A1
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9669, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_AirContestLadyShow:: @ 82A89A1
+    msgbox LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests, MSGBOX_DEFAULT
     special PutLilycoveContestLadyShowOnTheAir
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A89AE:: @ 82A89AE
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9451, MSGBOX_DEFAULT
+LilycoveCity_PokemonCenter_1F_EventScript_NoPokeblockCase:: @ 82A89AE
+    msgbox LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase, MSGBOX_DEFAULT
     release
     end
 
-LilycoveCity_PokemonCenter_1F_Movement_2A89B8: @ 82A89B8
+LilycoveCity_PokemonCenter_1F_Movement_LadyFaceMon: @ 82A89B8
     face_right
     delay_8
     step_end
 
-LilycoveCity_PokemonCenter_1F_Movement_2A89BB: @ 82A89BB
+LilycoveCity_PokemonCenter_1F_Movement_MonFaceLady: @ 82A89BB
     face_left
     delay_8
     step_end
 
-LilycoveCity_PokemonCenter_1F_Movement_2A89BE: @ 82A89BE
+@ Unused
+LilycoveCity_PokemonCenter_1F_Movement_MonFaceDown: @ 82A89BE
     face_down
     step_end
 
-LilycoveCity_PokemonCenter_1F_Movement_2A89C0: @ 82A89C0
+LilycoveCity_PokemonCenter_1F_Movement_LadyFacePlayer: @ 82A89C0
     face_player
     step_end
 
-LilycoveCity_PokemonCenter_1F_Movement_2A89C2: @ 82A89C2
+LilycoveCity_PokemonCenter_1F_Movement_MonJump: @ 82A89C2
     disable_jump_landing_ground_effect
     jump_in_place_left
     disable_jump_landing_ground_effect
     jump_in_place_left
     step_end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A89C7:: @ 82A89C7
+LilycoveCity_PokemonCenter_1F_EventScript_ContestLadyMon:: @ 82A89C7
     specialvar VAR_RESULT, GetContestLadyCategory
     special Script_BufferContestLadyCategoryAndMonName
     special GetContestLadyMonSpecies
     compare VAR_RESULT, CONTEST_CATEGORY_COOL
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon
     compare VAR_RESULT, CONTEST_CATEGORY_BEAUTY
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Skitty
     compare VAR_RESULT, CONTEST_CATEGORY_CUTE
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A30
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Poochyena
     compare VAR_RESULT, CONTEST_CATEGORY_SMART
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A43
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Kecleon
     compare VAR_RESULT, CONTEST_CATEGORY_TOUGH
-    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_2A8A56
+    goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_Pikachu
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8A0A:: @ 82A8A0A
+LilycoveCity_PokemonCenter_1F_EventScript_Zigzagoon:: @ 82A8A0A
     lock
     faceplayer
     waitse
     playmoncry VAR_0x8005, 0
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A96DA, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_Zigzagoon, MSGBOX_DEFAULT
     waitmoncry
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8A1D:: @ 82A8A1D
+LilycoveCity_PokemonCenter_1F_EventScript_Skitty:: @ 82A8A1D
     lock
     faceplayer
     waitse
     playmoncry VAR_0x8005, 0
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A970E, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_Skitty, MSGBOX_DEFAULT
     waitmoncry
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8A30:: @ 82A8A30
+LilycoveCity_PokemonCenter_1F_EventScript_Poochyena:: @ 82A8A30
     lock
     faceplayer
     waitse
     playmoncry VAR_0x8005, 0
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A96F6, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_Poochyena, MSGBOX_DEFAULT
     waitmoncry
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8A43:: @ 82A8A43
+LilycoveCity_PokemonCenter_1F_EventScript_Kecleon:: @ 82A8A43
     lock
     faceplayer
     waitse
     playmoncry VAR_0x8005, 0
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A96E6, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_Kecleon, MSGBOX_DEFAULT
     waitmoncry
     release
     end
 
-LilycoveCity_PokemonCenter_1F_EventScript_2A8A56:: @ 82A8A56
+LilycoveCity_PokemonCenter_1F_EventScript_Pikachu:: @ 82A8A56
     lock
     faceplayer
     waitse
     playmoncry VAR_0x8005, 0
-    msgbox LilycoveCity_PokemonCenter_1F_Text_2A9703, MSGBOX_DEFAULT
+    msgbox LilycoveCity_PokemonCenter_1F_Text_Pikachu, MSGBOX_DEFAULT
     waitmoncry
     release
     end
 
-LilycoveCity_PokemonCenter_1F_Text_2A8A69: @ 82A8A69
+LilycoveCity_PokemonCenter_1F_Text_ImTheFavorLady: @ 82A8A69
     .string "I'm the FAVOR LADY…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8A7D: @ 82A8A7D
+LilycoveCity_PokemonCenter_1F_Text_ObsessedWithThing: @ 82A8A7D
     .string "I've recently developed an obsession\n"
     .string "for {STR_VAR_1} things…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8AB1: @ 82A8AB1
+LilycoveCity_PokemonCenter_1F_Text_ThankYouForLastTime: @ 82A8AB1
     .string "Oh…\n"
     .string "Thank you for last time…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8ACE: @ 82A8ACE
+LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeBadThing: @ 82A8ACE
     .string "Before, I think it was {STR_VAR_3}…\p"
     .string "{STR_VAR_3} gave me one {STR_VAR_2},\n"
     .string "saying it was {STR_VAR_1}.\p"
     .string "But it wasn't {STR_VAR_1}.\n"
     .string "Not in the least bit.$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8B36: @ 82A8B36
+LilycoveCity_PokemonCenter_1F_Text_PlayerGaveMeGreatThing: @ 82A8B36
     .string "Before, {STR_VAR_3} gave me a very\n"
     .string "{STR_VAR_1} {STR_VAR_2}.\p"
     .string "I cherish it now.$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8B69: @ 82A8B69
+LilycoveCity_PokemonCenter_1F_Text_WillYouShareThing: @ 82A8B69
     .string "Listen, if you have anything that\n"
     .string "is {STR_VAR_1}, will you share it\l"
     .string "with me?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8BAD: @ 82A8BAD
+LilycoveCity_PokemonCenter_1F_Text_WhatWillYouGiveMe: @ 82A8BAD
     .string "…Really?\n"
     .string "What will you give me?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8BCD: @ 82A8BCD
+LilycoveCity_PokemonCenter_1F_Text_IsThatSoGoodbye: @ 82A8BCD
     .string "Is that so?\n"
     .string "Then, it's good-bye…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8BEE: @ 82A8BEE
+LilycoveCity_PokemonCenter_1F_Text_NotWillingToShare: @ 82A8BEE
     .string "Oh…\n"
     .string "You're not willing to share?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8C0F: @ 82A8C0F
+LilycoveCity_PokemonCenter_1F_Text_IllTryToCherishIt: @ 82A8C0F
     .string "Oh?\n"
     .string "That {STR_VAR_2} is {STR_VAR_1}?\p"
     .string "…Oh, is that right?\p"
     .string "Well, I owe you a thanks anyway.\n"
     .string "I'll try to cherish it…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8C6F: @ 82A8C6F
+LilycoveCity_PokemonCenter_1F_Text_IWillCherishThis: @ 82A8C6F
     .string "Oh…\p"
     .string "That's a quite {STR_VAR_1}\n"
     .string "{STR_VAR_2}…\p"
@@ -653,7 +651,7 @@ LilycoveCity_PokemonCenter_1F_Text_2A8C6F: @ 82A8C6F
     .string "Thank you…\n"
     .string "I will cherish this…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8
+LilycoveCity_PokemonCenter_1F_Text_IWillTreasureThis: @ 82A8CC8
     .string "…Oh, oh, oh…\p"
     .string "This is amazing!\n"
     .string "This really is {STR_VAR_1}!\p"
@@ -663,89 +661,90 @@ LilycoveCity_PokemonCenter_1F_Text_2A8CC8: @ 82A8CC8
     .string "I will treasure this for the rest\n"
     .string "of my life!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8D5D: @ 82A8D5D
+LilycoveCity_PokemonCenter_1F_Text_IllGiveYouThisInReturn: @ 82A8D5D
     .string "I'll give you this wonderful item in\n"
     .string "return for your fabulous gift.\p"
     .string "I hope you will cherish it…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8DBD: @ 82A8DBD
+LilycoveCity_PokemonCenter_1F_Text_YouDontHaveSpaceForIt: @ 82A8DBD
     .string "Oh, you can't have it if you don't have\n"
     .string "the space for it.\p"
     .string "Please come see me when you get\n"
     .string "your BAG organized…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8E2B: @ 82A8E2B
+LilycoveCity_PokemonCenter_1F_Text_ImTheQuizLady: @ 82A8E2B
     .string "I'm the QUIZ LADY!\n"
     .string "I love quizzes!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8E4E: @ 82A8E4E
+LilycoveCity_PokemonCenter_1F_Text_WaitingToTakeYourQuiz: @ 82A8E4E
     .string "Oh?\p"
     .string "I'm waiting for a challenger to answer\n"
     .string "the quiz you made.\p"
     .string "We can chat another time, okay?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8EAC: @ 82A8EAC
+LilycoveCity_PokemonCenter_1F_Text_WaitingForChallenger: @ 82A8EAC
     .string "I'm waiting for someone to challenge\n"
     .string "a quiz this {STR_VAR_1} thought up!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8EEC: @ 82A8EEC
+LilycoveCity_PokemonCenter_1F_Text_TakeQuizChallenge: @ 82A8EEC
     .string "If you answer correctly, you can win\n"
     .string "fabulous prizes!\p"
     .string "Would you like to take the quiz\n"
     .string "challenge?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8F4D: @ 82A8F4D
+LilycoveCity_PokemonCenter_1F_Text_WaitForAnswer: @ 82A8F4D
     .string "… … … … … …\n"
     .string "… … … … … …$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8F65: @ 82A8F65
+LilycoveCity_PokemonCenter_1F_Text_HowBoringBye: @ 82A8F65
     .string "Oh, how boring!\n"
     .string "Bye-bye!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8F7E: @ 82A8F7E
+LilycoveCity_PokemonCenter_1F_Text_YoureGoingToQuit: @ 82A8F7E
     .string "Awww!\n"
     .string "You're going to quit?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8F9A: @ 82A8F9A
+LilycoveCity_PokemonCenter_1F_Text_TakeTheQuizAnotherTime: @ 82A8F9A
     .string "Please take the quiz challenge\n"
     .string "another time!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A8FC7: @ 82A8FC7
+LilycoveCity_PokemonCenter_1F_Text_YouGotItRight: @ 82A8FC7
     .string "You're amazing! You've got it right!\n"
     .string "You're one sharp customer!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9007: @ 82A9007
+LilycoveCity_PokemonCenter_1F_Text_YouGotItRightYouveWonPersonsPrize: @ 82A9007
     .string "Congratulations!\n"
     .string "You've got the quiz right!\p"
     .string "You've won a prize provided by\n"
     .string "{STR_VAR_1}!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9056: @ 82A9056
+@ Unused
+LilycoveCity_PokemonCenter_1F_Text_XReceivedOneY: @ 82A9056
     .string "{STR_VAR_1} received\n"
     .string "one {STR_VAR_2}!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A906A: @ 82A906A
+LilycoveCity_PokemonCenter_1F_Text_YourBagIsFilledUp: @ 82A906A
     .string "Oh? Your BAG is filled up!\n"
     .string "Come see me when you have room.$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A90A5: @ 82A90A5
+LilycoveCity_PokemonCenter_1F_Text_WrongTheCorrectAnswerIs: @ 82A90A5
     .string "Hmm… Wrong!\n"
     .string "The correct answer is “{STR_VAR_3}”!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A90CD: @ 82A90CD
+LilycoveCity_PokemonCenter_1F_Text_IGetToKeepPrize: @ 82A90CD
     .string "Too bad!\p"
     .string "I get to keep the quiz prize\n"
     .string "{STR_VAR_1} now!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A90FB: @ 82A90FB
+LilycoveCity_PokemonCenter_1F_Text_MakeYourOwnQuiz: @ 82A90FB
     .string "Listen, listen!\n"
     .string "Would you like to make your own quiz?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9131: @ 82A9131
+LilycoveCity_PokemonCenter_1F_Text_MaybeNextTime: @ 82A9131
     .string "Oh, I see…\n"
     .string "Well, maybe next time!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153
+LilycoveCity_PokemonCenter_1F_Text_PickYourPrize: @ 82A9153
     .string "Okay, the first thing you have to do\n"
     .string "is pick the prize for the person that\l"
     .string "answers your quiz correctly.\p"
@@ -753,46 +752,47 @@ LilycoveCity_PokemonCenter_1F_Text_2A9153: @ 82A9153
     .string "the quiz can't get it right, I get to\l"
     .string "keep the prize!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9212: @ 82A9212
+LilycoveCity_PokemonCenter_1F_Text_QuitChoosingPrize: @ 82A9212
     .string "If you don't choose a prize,\n"
     .string "your quiz can't be made.\p"
     .string "Are you going to quit making\n"
     .string "your quiz?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9270: @ 82A9270
+LilycoveCity_PokemonCenter_1F_Text_WriteYourQuiz: @ 82A9270
     .string "Oh, how nice!\n"
     .string "That's a wonderful prize!\p"
     .string "Next, you need to write your quiz\n"
     .string "question and its answer.$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A92D3: @ 82A92D3
+LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizQuestion: @ 82A92D3
     .string "Are you going to quit writing\n"
     .string "your quiz question?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9305: @ 82A9305
+@ Unused
+LilycoveCity_PokemonCenter_1F_Text_QuitWritingQuizAnswer: @ 82A9305
     .string "Are you going to quit choosing\n"
     .string "your quiz answer?$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9336: @ 82A9336
+LilycoveCity_PokemonCenter_1F_Text_IllLookForAChallenger: @ 82A9336
     .string "Thank you!\n"
     .string "You've put together a nice quiz.\p"
     .string "I'll go look for someone who'll take\n"
     .string "your quiz challenge right away.$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A93A7: @ 82A93A7
+LilycoveCity_PokemonCenter_1F_Text_ImTheContestLady: @ 82A93A7
     .string "I'm the CONTEST LADY!\n"
     .string "I sure do love CONTESTS!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A93D6: @ 82A93D6
+LilycoveCity_PokemonCenter_1F_Text_ThankForPokeblock: @ 82A93D6
     .string "Thanks for your {POKEBLOCK} before!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A93F4: @ 82A93F4
+LilycoveCity_PokemonCenter_1F_Text_MyFriendDisplaysQuality: @ 82A93F4
     .string "This is my friend {STR_VAR_1}!\n"
     .string "It's the epitome of {STR_VAR_2}!\p"
     .string "But I think that it will display\n"
     .string "even more {STR_VAR_2}!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9451: @ 82A9451
+LilycoveCity_PokemonCenter_1F_Text_DontHaveAPokeblockCase: @ 82A9451
     .string "So, I need your help!\p"
     .string "Please, may I have one {POKEBLOCK}?\n"
     .string "All I'm asking for is one!\p"
@@ -800,57 +800,57 @@ LilycoveCity_PokemonCenter_1F_Text_2A9451: @ 82A9451
     .string "Don't you have a {POKEBLOCK} CASE?\l"
     .string "That's no good. Next time, then!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A94E8: @ 82A94E8
+LilycoveCity_PokemonCenter_1F_Text_AskingForOnePokeblock: @ 82A94E8
     .string "So, I need your help!\p"
     .string "Please, may I have one {POKEBLOCK}?\n"
     .string "All I'm asking for is one!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9537: @ 82A9537
+LilycoveCity_PokemonCenter_1F_Text_ICantHaveOnePokeblock: @ 82A9537
     .string "Awww!\n"
     .string "I can't have one {POKEBLOCK}?!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9556: @ 82A9556
+LilycoveCity_PokemonCenter_1F_Text_WhatACheapskate: @ 82A9556
     .string "Sheesh!\n"
     .string "What a cheapskate!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9571: @ 82A9571
+LilycoveCity_PokemonCenter_1F_Text_IllUseYourPokeblock: @ 82A9571
     .string "Yay!\n"
     .string "Thank you!\p"
     .string "I'll feed my POKéMON your {POKEBLOCK}\n"
     .string "right away.$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A95AD: @ 82A95AD
+LilycoveCity_PokemonCenter_1F_Text_NoChangeThanks: @ 82A95AD
     .string "…It doesn't seem to have changed\n"
     .string "in any way at all…\p"
     .string "Hmm…\p"
     .string "Oh, well!\n"
     .string "Thank you very much!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9605: @ 82A9605
+LilycoveCity_PokemonCenter_1F_Text_ReallyImprovedThanks: @ 82A9605
     .string "Oh, yay!\n"
     .string "It's really delighted!\p"
     .string "I think it really improved {STR_VAR_1}'s\n"
     .string "{STR_VAR_2} quality, too.\p"
     .string "Thank you so much!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9669: @ 82A9669
+LilycoveCity_PokemonCenter_1F_Text_ReadyToEnterContests: @ 82A9669
     .string "Hmm…\p"
     .string "I think we may be ready to enter\n"
     .string "some CONTESTS.\p"
     .string "If you see us in one somewhere,\n"
     .string "I hope you'll cheer for us.$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A96DA: @ 82A96DA
+LilycoveCity_PokemonCenter_1F_Text_Zigzagoon: @ 82A96DA
     .string "{STR_VAR_1}: Guguuh!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A96E6: @ 82A96E6
+LilycoveCity_PokemonCenter_1F_Text_Kecleon: @ 82A96E6
     .string "{STR_VAR_1}: Igigigiiih!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A96F6: @ 82A96F6
+LilycoveCity_PokemonCenter_1F_Text_Poochyena: @ 82A96F6
     .string "{STR_VAR_1}: Baaarun…$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A9703: @ 82A9703
+LilycoveCity_PokemonCenter_1F_Text_Pikachu: @ 82A9703
     .string "{STR_VAR_1}: Pikka!$"
 
-LilycoveCity_PokemonCenter_1F_Text_2A970E: @ 82A970E
+LilycoveCity_PokemonCenter_1F_Text_Skitty: @ 82A970E
     .string "{STR_VAR_1}: Umyaaaan!$"
diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc
index 0ab47ea80..deeec7721 100644
--- a/data/scripts/mauville_man.inc
+++ b/data/scripts/mauville_man.inc
@@ -1,273 +1,277 @@
-MauvilleCity_PokemonCenter_1F_EventScript_28E066:: @ 828E066
+MauvilleCity_PokemonCenter_1F_EventScript_MauvilleOldMan:: @ 828E066
 	special ScrSpecial_GetCurrentMauvilleMan
 	switch VAR_RESULT
-	case 0, MauvilleCity_PokemonCenter_1F_EventScript_28E0A6
-	case 1, MauvilleCity_PokemonCenter_1F_EventScript_28E167
-	case 2, MauvilleCity_PokemonCenter_1F_EventScript_28E4D4
-	case 3, MauvilleCity_PokemonCenter_1F_EventScript_29014A
-	case 4, MauvilleCity_PokemonCenter_1F_EventScript_2902F6
+	case MAUVILLE_MAN_BARD, MauvilleCity_PokemonCenter_1F_EventScript_Bard
+	case MAUVILLE_MAN_HIPSTER, MauvilleCity_PokemonCenter_1F_EventScript_Hipster
+	case MAUVILLE_MAN_TRADER, MauvilleCity_PokemonCenter_1F_EventScript_Trader
+	case MAUVILLE_MAN_STORYTELLER, MauvilleCity_PokemonCenter_1F_EventScript_Storyteller
+	case MAUVILLE_MAN_GIDDY, MauvilleCity_PokemonCenter_1F_EventScript_Giddy
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E0A6:: @ 828E0A6
+@ Bard
+MauvilleCity_PokemonCenter_1F_EventScript_Bard:: @ 828E0A6
 	lock
 	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_29038E, MSGBOX_YESNO
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0C7
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PlaySong
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0EA
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E0C7:: @ 828E0C7
+MauvilleCity_PokemonCenter_1F_EventScript_PlaySong:: @ 828E0C7
 	setvar VAR_0x8004, 0
 	special ScrSpecial_PlayBardSong
 	delay 60
 	special ScrSpecial_HasBardSongBeenChanged
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E0F4
-	msgbox MauvilleCity_PokemonCenter_1F_Text_2903E6, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E0EA:: @ 828E0EA
-	msgbox MauvilleCity_PokemonCenter_1F_Text_2903C0, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineSong:: @ 828E0EA
+	msgbox MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E0F4:: @ 828E0F4
-	msgbox MauvilleCity_PokemonCenter_1F_Text_290421, MSGBOX_YESNO
+MauvilleCity_PokemonCenter_1F_EventScript_AskToWriteLyrics:: @ 828E0F4
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E113:: @ 828E113
+MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics:: @ 828E113
 	setvar VAR_0x8004, EASY_CHAT_TYPE_BARD_SONG
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E15D
-	msgbox MauvilleCity_PokemonCenter_1F_Text_2904C1, MSGBOX_DEFAULT
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics
+	msgbox MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou, MSGBOX_DEFAULT
 	setvar VAR_0x8004, 1
 	special ScrSpecial_PlayBardSong
 	delay 60
-	msgbox MauvilleCity_PokemonCenter_1F_Text_2904EB, MSGBOX_YESNO
+	msgbox MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E113
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_WriteLyrics
 	special ScrSpecial_SaveBardSongLyrics
-	msgbox MauvilleCity_PokemonCenter_1F_Text_290514, MSGBOX_DEFAULT
+	msgbox MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E15D:: @ 828E15D
-	msgbox MauvilleCity_PokemonCenter_1F_Text_29049B, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineWritingLyrics:: @ 828E15D
+	msgbox MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E167:: @ 828E167
+@ Hipster
+MauvilleCity_PokemonCenter_1F_EventScript_Hipster:: @ 828E167
 	lock
 	faceplayer
 	setflag FLAG_SYS_HIPSTER_MEET
-	msgbox MauvilleCity_PokemonCenter_1F_Text_29054C, MSGBOX_DEFAULT
+	msgbox MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening, MSGBOX_DEFAULT
 	special ScrSpecial_GetHipsterSpokenFlag
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E18C
-	msgbox MauvilleCity_PokemonCenter_1F_Text_290598, MSGBOX_DEFAULT
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord
+	msgbox MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E18C:: @ 828E18C
+MauvilleCity_PokemonCenter_1F_EventScript_TryTeachWord:: @ 828E18C
 	special ScrSpecial_HipsterTeachWord
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E1A4
-	msgbox MauvilleCity_PokemonCenter_1F_Text_290602, MSGBOX_DEFAULT
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TeachWord
+	msgbox MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E1A4:: @ 828E1A4
-	msgbox MauvilleCity_PokemonCenter_1F_Text_290666, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_TeachWord:: @ 828E1A4
+	msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase, MSGBOX_DEFAULT
 	special ScrSpecial_SetHipsterSpokenFlag
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_Text_28E1B1: @ 828E1B1
+@ Trader
+MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor: @ 828E1B1
 	.string "Hi, I'm the TRADER.\n"
 	.string "Want to trade decorations with me?$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E1E8: @ 828E1E8
+MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues: @ 828E1E8
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E20E: @ 828E20E
+MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded: @ 828E20E
 	.string "But we've traded decorations already,\n"
 	.string "you and I.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E23F: @ 828E23F
+MauvilleCity_PokemonCenter_1F_Text_PickADecorItem: @ 828E23F
 	.string "If you see any decorative item that\n"
 	.string "you want of mine, speak up.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E27F: @ 828E27F
+MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything: @ 828E27F
 	.string "You don't want anything?\n"
 	.string "I feel unwanted…$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E2A9: @ 828E2A9
+MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt: @ 828E2A9
 	.string "That decorative item once belonged\n"
 	.string "to {STR_VAR_1}.\p"
 	.string "Do you want it?$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E2E3: @ 828E2E3
+MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor: @ 828E2E3
 	.string "Uh… Wait a second. You don't have a\n"
 	.string "single piece of decoration!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E323: @ 828E323
+MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade: @ 828E323
 	.string "Okay, pick the decoration that you'll\n"
 	.string "trade to me.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E356: @ 828E356
+MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade: @ 828E356
 	.string "You won't trade with me?\n"
 	.string "I feel unwanted…$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E380: @ 828E380
+MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis: @ 828E380
 	.string "You've got all the {STR_VAR_2}S that can\n"
 	.string "be stored. You've no room for this.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E3C4: @ 828E3C4
+MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor: @ 828E3C4
 	.string "Okay, so we'll trade my {STR_VAR_3}\n"
 	.string "for your {STR_VAR_2}?$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E3EC: @ 828E3EC
+MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse: @ 828E3EC
 	.string "That piece of decoration is in use.\n"
 	.string "You can't trade it.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E424: @ 828E424
+MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC: @ 828E424
 	.string "Then we'll trade!\n"
 	.string "I'll send my decoration to your PC.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E45A: @ 828E45A
+MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne: @ 828E45A
 	.string "Oops! Sorry! That's a really rare\n"
 	.string "piece of decoration.\l"
 	.string "I can't trade that one away!\p"
 	.string "Can I interest you in something else?$"
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4
+MauvilleCity_PokemonCenter_1F_EventScript_Trader:: @ 828E4D4
 	lock
 	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, MSGBOX_YESNO
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WantToTradeDecor, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade
 	special ScrSpecial_GetTraderTradedFlag
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D
-	message MauvilleCity_PokemonCenter_1F_Text_28E23F
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded
+	message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem
 	waitmessage
-	goto MauvilleCity_PokemonCenter_1F_EventScript_28E517
+	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E503:: @ 828E503
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E1E8, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineTrade:: @ 828E503
+	msgbox MauvilleCity_PokemonCenter_1F_Text_TraderFeelingTheBlues, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E20E, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_AlreadyTraded:: @ 828E50D
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WeveAlreadyTraded, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
+MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive:: @ 828E517
 	special ScrSpecial_TraderMenuGetDecoration
 	waitstate
 	compare VAR_0x8004, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558
-	compare VAR_0x8004, 65535
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E562
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, MSGBOX_YESNO
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor
+	compare VAR_0x8004, 0xFFFF
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor
+	msgbox MauvilleCity_PokemonCenter_1F_Text_OnceBelongedToPlayerDoYouWantIt, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor
 	special ScrSpecial_DoesPlayerHaveNoDecorations
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A
-	goto MauvilleCity_PokemonCenter_1F_EventScript_28E584
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor
+	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E558:: @ 828E558
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E27F, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_CancelPickDecor:: @ 828E558
+	msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontWantAnything, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E562:: @ 828E562
-	message MauvilleCity_PokemonCenter_1F_Text_28E45A
+MauvilleCity_PokemonCenter_1F_EventScript_InvalidDecor:: @ 828E562
+	message MauvilleCity_PokemonCenter_1F_Text_CantTradeThatOne
 	waitmessage
-	goto MauvilleCity_PokemonCenter_1F_EventScript_28E517
+	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E56E:: @ 828E56E
-	message MauvilleCity_PokemonCenter_1F_Text_28E23F
+MauvilleCity_PokemonCenter_1F_EventScript_PickDifferentDecor:: @ 828E56E
+	message MauvilleCity_PokemonCenter_1F_Text_PickADecorItem
 	waitmessage
-	goto MauvilleCity_PokemonCenter_1F_EventScript_28E517
+	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToReceive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E2E3, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_DontHaveAnyDecor:: @ 828E57A
+	msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontHaveAnyDecor, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive:: @ 828E584
+	msgbox MauvilleCity_PokemonCenter_1F_Text_PickTheDecorToTrade, MSGBOX_DEFAULT
 	special ScrSpecial_TraderMenuGiveDecoration
 	waitstate
 	compare VAR_0x8006, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4
-	compare VAR_0x8006, 65535
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor
+	compare VAR_0x8006, 0xFFFF
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse
 	special ScrSpecial_IsDecorationFull
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, MSGBOX_YESNO
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor
+	msgbox MauvilleCity_PokemonCenter_1F_Text_SoWellTradeTheseDecor, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
 	special ScrSpecial_TraderDoDecorationTrade
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, MSGBOX_DEFAULT
+	msgbox MauvilleCity_PokemonCenter_1F_Text_SendDecorToYourPC, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E5D4:: @ 828E5D4
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E356, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_CancelGiveDecor:: @ 828E5D4
+	msgbox MauvilleCity_PokemonCenter_1F_Text_YouDontWantToTrade, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E5DE:: @ 828E5DE
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E3EC, MSGBOX_DEFAULT
-	goto MauvilleCity_PokemonCenter_1F_EventScript_28E584
+MauvilleCity_PokemonCenter_1F_EventScript_DecorInUse:: @ 828E5DE
+	msgbox MauvilleCity_PokemonCenter_1F_Text_ThatDecorIsInUse, MSGBOX_DEFAULT
+	goto MauvilleCity_PokemonCenter_1F_EventScript_PickDecorToGive
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_28E5EC:: @ 828E5EC
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E380, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_NoRoomForDecor:: @ 828E5EC
+	msgbox MauvilleCity_PokemonCenter_1F_Text_YouveNoRoomForThis, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_Text_28E5F6: @ 828E5F6
+@ Storyteller
+MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale: @ 828E5F6
 	.string "I'm the STORYTELLER.\n"
 	.string "I'll tell you tales of legendary\l"
 	.string "TRAINERS.\p"
 	.string "Will you hear my tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E64D: @ 828E64D
+MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues: @ 828E64D
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E673: @ 828E673
+MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell: @ 828E673
 	.string "I know of these legends.\n"
 	.string "Which tale will you have me tell?$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E6AE: @ 828E6AE
+MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales: @ 828E6AE
 	.string "But, I know of no legendary TRAINERS.\n"
 	.string "Hence, I know no tales.\p"
 	.string "Where does one find a TRAINER worthy\n"
 	.string "of a legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E726: @ 828E726
+MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes: @ 828E726
 	.string "What's that?!\n"
 	.string "You… You…\p"
 	.string "{STR_VAR_2}\n"
@@ -275,12 +279,12 @@ MauvilleCity_PokemonCenter_1F_Text_28E726: @ 828E726
 	.string "That is indeed magnificent!\n"
 	.string "It's the birth of a new legend!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E78A: @ 828E78A
+MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends: @ 828E78A
 	.string "It gets me thinking, could there be\n"
 	.string "other TRAINERS with more impressive\l"
 	.string "legends awaiting discovery?$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E7EE: @ 828E7EE
+MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales: @ 828E7EE
 	.string "Are you a TRAINER?\p"
 	.string "Then tell me, have you any tales that\n"
 	.string "are even remotely legendary?$"
@@ -289,24 +293,24 @@ MauvilleCity_PokemonCenter_1F_Text_28E844: @ 828E844
 	.string "Incidentally… Would you care to hear\n"
 	.string "another legendary tale?$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E881: @ 828E881
+MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend: @ 828E881
 	.string "Hmm…\n"
 	.string "I'm not satisfied…\p"
 	.string "I wish you would bring me news worthy\n"
 	.string "of being called a legend.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
+MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested: @ 828E8D9
 	.string "I wish more people would be interested\n"
 	.string "in hearing my epic tales of legendary\l"
 	.string "TRAINERS.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E930:: @ 828E930
+MauvilleCity_PokemonCenter_1F_Text_SavedGameTitle:: @ 828E930
 	.string "The Save-Happy TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E947:: @ 828E947
+MauvilleCity_PokemonCenter_1F_Text_SavedGameAction:: @ 828E947
 	.string "Saved the game$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956
+MauvilleCity_PokemonCenter_1F_Text_SavedGameStory:: @ 828E956
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER saved the game\n"
@@ -314,13 +318,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956
 	.string "A more cautious TRAINER than\n"
 	.string "{STR_VAR_3} one will never find!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E9D7:: @ 828E9D7
+MauvilleCity_PokemonCenter_1F_Text_TrendsStartedTitle:: @ 828E9D7
 	.string "The Trendsetter TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E9EF:: @ 828E9EF
+MauvilleCity_PokemonCenter_1F_Text_TrendsStartedAction:: @ 828E9EF
 	.string "Started trends$"
 
-MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE
+MauvilleCity_PokemonCenter_1F_Text_TrendsStartedStory:: @ 828E9FE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER started new trends\n"
@@ -328,13 +332,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE
 	.string "{STR_VAR_3} is setting trends for all\n"
 	.string "the HOENN region!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EA7D:: @ 828EA7D
+MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedTitle:: @ 828EA7D
     .string "The BERRY-Planting TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EA98:: @ 828EA98
+MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedAction:: @ 828EA98
 	.string "Planted BERRIES$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8
+MauvilleCity_PokemonCenter_1F_Text_BerriesPlantedStory:: @ 828EAA8
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER planted BERRIES\n"
@@ -342,13 +346,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8
 	.string "{STR_VAR_3} is a legendary lover of\n"
 	.string "BERRIES!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EB19:: @ 828EB19
+MauvilleCity_PokemonCenter_1F_Text_BikeTradesTitle:: @ 828EB19
 	.string "The BIKE-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EB31:: @ 828EB31
+MauvilleCity_PokemonCenter_1F_Text_BikeTradesAction:: @ 828EB31
 	.string "Traded BIKES$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E
+MauvilleCity_PokemonCenter_1F_Text_BikeTradesStory:: @ 828EB3E
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER swapped BIKES\n"
@@ -356,13 +360,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E
 	.string "{STR_VAR_3} must love BIKES deeply\n"
 	.string "and passionately!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EBB5:: @ 828EBB5
+MauvilleCity_PokemonCenter_1F_Text_InterviewsTitle:: @ 828EBB5
 	.string "The Interviewed TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EBCD:: @ 828EBCD
+MauvilleCity_PokemonCenter_1F_Text_InterviewsAction:: @ 828EBCD
 	.string "Got interviewed$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD
+MauvilleCity_PokemonCenter_1F_Text_InterviewsStory:: @ 828EBDD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got interviewed\n"
@@ -370,26 +374,26 @@ MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD
 	.string "{STR_VAR_3} must be a TRAINER who's\n"
 	.string "attracting much attention!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EC60:: @ 828EC60
+MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesTitle:: @ 828EC60
 	.string "The Battle-Happy TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EC79:: @ 828EC79
+MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesAction:: @ 828EC79
 	.string "Battled$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EC81:: @ 828EC81
+MauvilleCity_PokemonCenter_1F_Text_TrainerBattlesStory:: @ 828EC81
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER battled {STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must be a TRAINER who can\n"
 	.string "never refuse a chance to battle!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28ED04:: @ 828ED04
+MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtTitle:: @ 828ED04
 	.string "The POKéMON-Catching TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28ED21:: @ 828ED21
+MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtAction:: @ 828ED21
 	.string "Caught POKéMON$"
 
-MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30
+MauvilleCity_PokemonCenter_1F_Text_PokemonCaughtStory:: @ 828ED30
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -397,13 +401,13 @@ MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30
 	.string "{STR_VAR_3} is a legendary catcher of\n"
 	.string "wild POKéMON!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EDA1:: @ 828EDA1
+MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtTitle:: @ 828EDA1
 	.string "The Fishing TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EDB5:: @ 828EDB5
+MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtAction:: @ 828EDB5
 	.string "Caught POKéMON with a ROD$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF
+MauvilleCity_PokemonCenter_1F_Text_FishingPokemonCaughtStory:: @ 828EDCF
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -411,13 +415,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF
 	.string "{STR_VAR_3} is a legendary fishing\n"
 	.string "expert!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EE45:: @ 828EE45
+MauvilleCity_PokemonCenter_1F_Text_EggsHatchedTitle:: @ 828EE45
 	.string "The EGG-Warming TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EE5D:: @ 828EE5D
+MauvilleCity_PokemonCenter_1F_Text_EggsHatchedAction:: @ 828EE5D
 	.string "Hatched EGGS$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A
+MauvilleCity_PokemonCenter_1F_Text_EggsHatchedStory:: @ 828EE6A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER hatched {STR_VAR_1} POKéMON\n"
@@ -425,13 +429,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A
 	.string "{STR_VAR_3} is a legendary warmer\n"
 	.string "of EGGS!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EEDD:: @ 828EEDD
+MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedTitle:: @ 828EEDD
 	.string "The Evolver TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EEF1:: @ 828EEF1
+MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedAction:: @ 828EEF1
 	.string "Evolved POKéMON$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01
+MauvilleCity_PokemonCenter_1F_Text_PokemonEvolvedStory:: @ 828EF01
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {STR_VAR_1} POKéMON\n"
@@ -439,13 +443,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01
 	.string "{STR_VAR_3} is the ultimate evolver\n"
 	.string "of POKéMON!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EF73:: @ 828EF73
+MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterTitle:: @ 828EF73
 	.string "The POKéMON CENTER-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EF95:: @ 828EF95
+MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterAction:: @ 828EF95
 	.string "Used POKéMON CENTERS$"
 
-MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA
+MauvilleCity_PokemonCenter_1F_Text_UsedPokemonCenterStory:: @ 828EFAA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -453,13 +457,13 @@ MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA
 	.string "There could be no greater lover of\n"
 	.string "POKéMON CENTERS than {STR_VAR_3}!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F045:: @ 828F045
+MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeTitle:: @ 828F045
 	.string "The Homebody TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F05A:: @ 828F05A
+MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeAction:: @ 828F05A
 	.string "Rested POKéMON at home$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071
+MauvilleCity_PokemonCenter_1F_Text_RestedAtHomeStory:: @ 828F071
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -467,13 +471,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071
 	.string "There could be no more of a homebody\n"
 	.string "than {STR_VAR_3}!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F0F3:: @ 828F0F3
+MauvilleCity_PokemonCenter_1F_Text_SafariGamesTitle:: @ 828F0F3
 	.string "The SAFARI-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F10D:: @ 828F10D
+MauvilleCity_PokemonCenter_1F_Text_SafariGamesAction:: @ 828F10D
 	.string "Entered the SAFARI ZONE$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125
+MauvilleCity_PokemonCenter_1F_Text_SafariGamesStory:: @ 828F125
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER went into the SAFARI ZONE\n"
@@ -481,13 +485,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125
 	.string "{STR_VAR_3} is a TRAINER whose wild side\n"
 	.string "must come out in the SAFARI ZONE!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F1BE:: @ 828F1BE
+MauvilleCity_PokemonCenter_1F_Text_UsedCutTitle:: @ 828F1BE
 	.string "The CUT-Frenzy TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F1D5:: @ 828F1D5
+MauvilleCity_PokemonCenter_1F_Text_UsedCutAction:: @ 828F1D5
 	.string "Used CUT$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE
+MauvilleCity_PokemonCenter_1F_Text_UsedCutStory:: @ 828F1DE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used CUT\n"
@@ -495,13 +499,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE
 	.string "{STR_VAR_3} is a TRAINER who just must\n"
 	.string "love to CUT!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F24F:: @ 828F24F
+MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashTitle:: @ 828F24F
 	.string "The ROCK-SMASHING TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F269:: @ 828F269
+MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashAction:: @ 828F269
 	.string "Smashed rocks$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277
+MauvilleCity_PokemonCenter_1F_Text_UsedRockSmashStory:: @ 828F277
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used ROCK SMASH\n"
@@ -509,13 +513,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "can't leave a stone unsmashed!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F2FC:: @ 828F2FC
+MauvilleCity_PokemonCenter_1F_Text_MovedBasesTitle:: @ 828F2FC
 	.string "The Move-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F314:: @ 828F314
+MauvilleCity_PokemonCenter_1F_Text_MovedBasesAction:: @ 828F314
 	.string "Moved the SECRET BASE$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A
+MauvilleCity_PokemonCenter_1F_Text_MovedBasesStory:: @ 828F32A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER moved the SECRET BASE\n"
@@ -523,13 +527,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A
 	.string "{STR_VAR_3} is a TRAINER who loves\n"
 	.string "to move houses often!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F3AD:: @ 828F3AD
+MauvilleCity_PokemonCenter_1F_Text_UsedSplashTitle:: @ 828F3AD
 	.string "The SPLASH-Happy TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F3C6:: @ 828F3C6
+MauvilleCity_PokemonCenter_1F_Text_UsedSplashAction:: @ 828F3C6
 	.string "Used SPLASH$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2
+MauvilleCity_PokemonCenter_1F_Text_UsedSplashStory:: @ 828F3D2
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used SPLASH\n"
@@ -537,13 +541,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2
 	.string "{STR_VAR_3} is a TRAINER who must love\n"
 	.string "SPLASHING around!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F44B:: @ 828F44B
+MauvilleCity_PokemonCenter_1F_Text_UsedStruggleTitle:: @ 828F44B
 	.string "The Tenacious TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F461:: @ 828F461
+MauvilleCity_PokemonCenter_1F_Text_UsedStruggleAction:: @ 828F461
 	.string "Resorted to using STRUGGLE$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C
+MauvilleCity_PokemonCenter_1F_Text_UsedStruggleStory:: @ 828F47C
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER had to rely on STRUGGLE\n"
@@ -551,13 +555,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C
 	.string "{STR_VAR_3} is a tenacious TRAINER\n"
 	.string "who never gives in to adversity!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F50C:: @ 828F50C
+MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsTitle:: @ 828F50C
 	.string "The SLOT Champ$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F51B:: @ 828F51B
+MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsAction:: @ 828F51B
 	.string "Won the jackpot on the SLOTS$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538
+MauvilleCity_PokemonCenter_1F_Text_SlotJackpotsStory:: @ 828F538
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won the jackpot on\n"
@@ -565,13 +569,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538
 	.string "{STR_VAR_3} is a TRAINER who was lucky\n"
 	.string "on the SLOTS!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F5BE:: @ 828F5BE
+MauvilleCity_PokemonCenter_1F_Text_RouletteWinsTitle:: @ 828F5BE
 	.string "The ROULETTE Champ$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F5D1:: @ 828F5D1
+MauvilleCity_PokemonCenter_1F_Text_RouletteWinsAction:: @ 828F5D1
 	.string "Had consecutive ROULETTE wins of$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2
+MauvilleCity_PokemonCenter_1F_Text_RouletteWinsStory:: @ 828F5F2
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won in ROULETTE\n"
@@ -579,13 +583,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2
 	.string "{STR_VAR_3} was lucky when the ball\n"
 	.string "bounced in ROULETTE!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F678:: @ 828F678
+MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesTitle:: @ 828F678
 	.string "The BATTLE TOWER Challenger$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F694:: @ 828F694
+MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesAction:: @ 828F694
 	.string "Took the BATTLE TOWER challenge$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4
+MauvilleCity_PokemonCenter_1F_Text_BattleTowerChallengesStory:: @ 828F6B4
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER took the BATTLE TOWER\n"
@@ -593,13 +597,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4
 	.string "{STR_VAR_3} is a TRAINER who aspires\n"
 	.string "for excellence in the BATTLE TOWER!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F751:: @ 828F751
+MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksTitle:: @ 828F751
 	.string "The Blend-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F76A:: @ 828F76A
+MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksAction:: @ 828F76A
 	.string "Made {POKEBLOCK}S$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776
+MauvilleCity_PokemonCenter_1F_Text_MadePokeblocksStory:: @ 828F776
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {POKEBLOCK}S\n"
@@ -607,13 +611,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776
 	.string "There is none better at using a BERRY\n"
 	.string "BLENDER than {STR_VAR_3}!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F7F6:: @ 828F7F6
+MauvilleCity_PokemonCenter_1F_Text_EnteredContestsTitle:: @ 828F7F6
 	.string "The CONTEST-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F811:: @ 828F811
+MauvilleCity_PokemonCenter_1F_Text_EnteredContestsAction:: @ 828F811
 	.string "Entered CONTESTS$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822
+MauvilleCity_PokemonCenter_1F_Text_EnteredContestsStory:: @ 828F822
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER entered CONTESTS\n"
@@ -621,13 +625,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822
 	.string "{STR_VAR_3} must love showing off\n"
 	.string "POKéMON to others!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F89C:: @ 828F89C
+MauvilleCity_PokemonCenter_1F_Text_WonContestsTitle:: @ 828F89C
 	.string "The CONTEST Master$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F8AF:: @ 828F8AF
+MauvilleCity_PokemonCenter_1F_Text_WonContestsAction:: @ 828F8AF
 	.string "Won CONTESTS$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC
+MauvilleCity_PokemonCenter_1F_Text_WonContestsStory:: @ 828F8BC
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won CONTESTS\n"
@@ -635,13 +639,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC
 	.string "{STR_VAR_3} must be an incredible\n"
 	.string "CONTEST master!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F92F:: @ 828F92F
+MauvilleCity_PokemonCenter_1F_Text_TimesShoppedTitle:: @ 828F92F
 	.string "The Happy Shopper$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F941:: @ 828F941
+MauvilleCity_PokemonCenter_1F_Text_TimesShoppedAction:: @ 828F941
 	.string "Shopped$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949
+MauvilleCity_PokemonCenter_1F_Text_TimesShoppedStory:: @ 828F949
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bought items in shops\n"
@@ -649,13 +653,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949
 	.string "{STR_VAR_3} must be one of those\n"
 	.string "people who are born to shop.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F9D1:: @ 828F9D1
+MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderTitle:: @ 828F9D1
 	.string "The Item-Finding TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F9EA:: @ 828F9EA
+MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderAction:: @ 828F9EA
 	.string "Used an ITEMFINDER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD
+MauvilleCity_PokemonCenter_1F_Text_UsedItemFinderStory:: @ 828F9FD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used an ITEMFINDER\n"
@@ -663,13 +667,13 @@ MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD
 	.string "{STR_VAR_3} must enjoy scouring the\n"
 	.string "ground for hidden items!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FA81:: @ 828FA81
+MauvilleCity_PokemonCenter_1F_Text_TimesRainedTitle:: @ 828FA81
 	.string "The Rain-Soaked TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FA99:: @ 828FA99
+MauvilleCity_PokemonCenter_1F_Text_TimesRainedAction:: @ 828FA99
 	.string "Got rained on$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7
+MauvilleCity_PokemonCenter_1F_Text_TimesRainedStory:: @ 828FAA7
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got soaked by rain\n"
@@ -677,13 +681,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7
 	.string "{STR_VAR_3}'s charisma must even\n"
 	.string "attract rain!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FB1D:: @ 828FB1D
+MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexTitle:: @ 828FB1D
 	.string "The Avid POKéDEX Reader$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FB35:: @ 828FB35
+MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexAction:: @ 828FB35
 	.string "Checked a POKéDEX$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47
+MauvilleCity_PokemonCenter_1F_Text_CheckedPokedexStory:: @ 828FB47
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked a POKéDEX\n"
@@ -691,13 +695,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47
 	.string "{STR_VAR_3} must love inspecting\n"
 	.string "POKéMON in a POKéDEX!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FBC4:: @ 828FBC4
+MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsTitle:: @ 828FBC4
 	.string "The RIBBON Collector$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FBD9:: @ 828FBD9
+MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsAction:: @ 828FBD9
 	.string "Received RIBBONS$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA
+MauvilleCity_PokemonCenter_1F_Text_ReceivedRibbonsStory:: @ 828FBEA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER received RIBBONS\n"
@@ -705,13 +709,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "loves to collect RIBBONS!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FC6B:: @ 828FC6B
+MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedTitle:: @ 828FC6B
 	.string "The Ledge-Jumping TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FC85:: @ 828FC85
+MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedAction:: @ 828FC85
 	.string "Jumped down ledges$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98
+MauvilleCity_PokemonCenter_1F_Text_LedgesJumpedStory:: @ 828FC98
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER jumped down ledges\n"
@@ -719,26 +723,26 @@ MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98
 	.string "If there's a ledge to be jumped,\n"
 	.string "{STR_VAR_3} can't ignore it!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FD1D:: @ 828FD1D
+MauvilleCity_PokemonCenter_1F_Text_TVWatchedTitle:: @ 828FD1D
 	.string "The Legendary TV Viewer$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FD35:: @ 828FD35
+MauvilleCity_PokemonCenter_1F_Text_TVWatchedAction:: @ 828FD35
 	.string "Watched TV$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FD40:: @ 828FD40
+MauvilleCity_PokemonCenter_1F_Text_TVWatchedStory:: @ 828FD40
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER watched TV\n"
 	.string "{STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must love watching TV!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FDA2:: @ 828FDA2
+MauvilleCity_PokemonCenter_1F_Text_CheckedClockTitle:: @ 828FDA2
 	.string "The Time-Conscious TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FDBD:: @ 828FDBD
+MauvilleCity_PokemonCenter_1F_Text_CheckedClockAction:: @ 828FDBD
 	.string "Checked the time$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE
+MauvilleCity_PokemonCenter_1F_Text_CheckedClockStory:: @ 828FDCE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked the time\n"
@@ -746,13 +750,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE
 	.string "{STR_VAR_3} must be a punctual TRAINER\n"
 	.string "who's conscious of the time.$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FE57:: @ 828FE57
+MauvilleCity_PokemonCenter_1F_Text_WonLotteryTitle:: @ 828FE57
 	.string "The POKéMON LOTTERY Wizard$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FE72:: @ 828FE72
+MauvilleCity_PokemonCenter_1F_Text_WonLotteryAction:: @ 828FE72
 	.string "Won POKéMON LOTTERIES$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88
+MauvilleCity_PokemonCenter_1F_Text_WonLotteryStory:: @ 828FE88
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won POKéMON LOTTERIES\n"
@@ -760,13 +764,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88
 	.string "{STR_VAR_3} must have many friends\n"
 	.string "to trade POKéMON with!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FF0C:: @ 828FF0C
+MauvilleCity_PokemonCenter_1F_Text_UsedDaycareTitle:: @ 828FF0C
 	.string "The DAY CARE-Using Trainer$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FF27:: @ 828FF27
+MauvilleCity_PokemonCenter_1F_Text_UsedDaycareAction:: @ 828FF27
 	.string "Left POKéMON at the DAY CARE$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44
+MauvilleCity_PokemonCenter_1F_Text_UsedDaycareStory:: @ 828FF44
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER left POKéMON with the\n"
@@ -774,13 +778,13 @@ MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44
 	.string "{STR_VAR_3} must be a real go-getter\n"
 	.string "who raises POKéMON aggressively!$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FFDD:: @ 828FFDD
+MauvilleCity_PokemonCenter_1F_Text_RodeCableCarTitle:: @ 828FFDD
 	.string "The CABLE CAR-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_28FFFA:: @ 828FFFA
+MauvilleCity_PokemonCenter_1F_Text_RodeCableCarAction:: @ 828FFFA
 	.string "Rode the CABLE CAR$"
 
-MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D
+MauvilleCity_PokemonCenter_1F_Text_RodeCableCarStory:: @ 829000D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER rode the CABLE CAR\n"
@@ -788,13 +792,13 @@ MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D
 	.string "{STR_VAR_3} must be a busy TRAINER\n"
 	.string "who's up and down all the time!$"
 
-MauvilleCity_PokemonCenter_1F_Text_290097:: @ 8290097
+MauvilleCity_PokemonCenter_1F_Text_HotSpringsTitle:: @ 8290097
 	.string "The Hot Spring-Loving TRAINER$"
 
-MauvilleCity_PokemonCenter_1F_Text_2900B5:: @ 82900B5
+MauvilleCity_PokemonCenter_1F_Text_HotSpringsAction:: @ 82900B5
 	.string "Bathed in hot springs$"
 
-MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB
+MauvilleCity_PokemonCenter_1F_Text_HotSpringsStory:: @ 82900CB
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bathed in hot springs\n"
@@ -803,160 +807,162 @@ MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB
 	.string "baby-smooth skin!$"
 
 
-MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A
+MauvilleCity_PokemonCenter_1F_EventScript_Storyteller:: @ 829014A
 	lock
 	faceplayer
 	setvar VAR_0x8008, 0
 	setvar VAR_0x8009, 0
 	setvar VAR_0x800A, 0
 	setvar VAR_0x800B, 0
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E5F6, MSGBOX_YESNO
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WillYouHearMyTale, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
 	specialvar VAR_RESULT, ScrSpecial_StorytellerGetFreeStorySlot
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901DA
-	message MauvilleCity_PokemonCenter_1F_Text_28E673
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales
+	message MauvilleCity_PokemonCenter_1F_Text_WhichTaleToTell
 	waitmessage
 	special ScrSpecial_StorytellerStoryListMenu
 	waitstate
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901B7
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection
 	setvar VAR_0x8008, 1
 	special ScrSpecial_StorytellerDisplayStory
 	waitmessage
 	waitbuttonpress
 	specialvar VAR_RESULT, ScrSpecial_StorytellerUpdateStat
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_2901BD
-	goto MauvilleCity_PokemonCenter_1F_EventScript_29020F
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales
+	goto MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale
 
-MauvilleCity_PokemonCenter_1F_EventScript_2901B7:: @ 82901B7
-	goto MauvilleCity_PokemonCenter_1F_EventScript_290219
+MauvilleCity_PokemonCenter_1F_EventScript_CancelStorySelection:: @ 82901B7
+	goto MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_2901BD:: @ 82901BD
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E78A, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_AreThereOtherTales:: @ 82901BD
+	msgbox MauvilleCity_PokemonCenter_1F_Text_CouldThereBeOtherLegends, MSGBOX_DEFAULT
 	specialvar VAR_RESULT, ScrSpecial_HasStorytellerAlreadyRecorded
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29022D
-	goto MauvilleCity_PokemonCenter_1F_EventScript_2901E2
-
-MauvilleCity_PokemonCenter_1F_EventScript_2901DA:: @ 82901DA
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E6AE, MSGBOX_DEFAULT
-
-MauvilleCity_PokemonCenter_1F_EventScript_2901E2:: @ 82901E2
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E7EE, MSGBOX_YESNO
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd
+	goto MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales
+
+MauvilleCity_PokemonCenter_1F_EventScript_KnowNoTales:: @ 82901DA
+	msgbox MauvilleCity_PokemonCenter_1F_Text_IKnowNoTales, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_DoYouHaveAnyTales:: @ 82901E2
+	msgbox MauvilleCity_PokemonCenter_1F_Text_HaveYouAnyLegendaryTales, MSGBOX_YESNO
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290219
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller
 	specialvar VAR_RESULT, ScrSpecial_StorytellerInitializeRandomStat
 	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29020F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E881, MSGBOX_DEFAULT
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale
+	msgbox MauvilleCity_PokemonCenter_1F_Text_NotWorthyOfLegend, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_29020F:: @ 829020F
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E726, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_TellPlayersTale:: @ 829020F
+	msgbox MauvilleCity_PokemonCenter_1F_Text_YouDidStatXTimes, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_290219:: @ 8290219
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E64D, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineStoryteller:: @ 8290219
+	msgbox MauvilleCity_PokemonCenter_1F_Text_StorytellerFeelingTheBlues, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_290223:: @ 8290223
-	msgbox MauvilleCity_PokemonCenter_1F_Text_28E8D9, MSGBOX_DEFAULT
+@ Unused
+MauvilleCity_PokemonCenter_1F_EventScript_WaitingForRecordMix:: @ 8290223
+	msgbox MauvilleCity_PokemonCenter_1F_Text_IWishMorePeopleWereInterested, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_29022D:: @ 829022D
+MauvilleCity_PokemonCenter_1F_EventScript_StorytellerEnd:: @ 829022D
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_Text_29022F: @ 829022F
+@ Giddy
+MauvilleCity_PokemonCenter_1F_Text_HearMyStory: @ 829022F
 	.string "I'm GIDDY!\n"
 	.string "I have a scintillating story for you!\p"
 	.string "Would you like to hear my story?$"
 
-MauvilleCity_PokemonCenter_1F_Text_290281: @ 8290281
+MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues: @ 8290281
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_2902A7: @ 82902A7
+MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking: @ 82902A7
 	.string "Also, I was thinking…$"
 
-MauvilleCity_PokemonCenter_1F_Text_2902BD: @ 82902BD
+MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain: @ 82902BD
 	.string "That's about it, I think…\p"
 	.string "We should chat again!\n"
 	.string "Bye-bye!$"
 
-MauvilleCity_PokemonCenter_1F_EventScript_2902F6:: @ 82902F6
+MauvilleCity_PokemonCenter_1F_EventScript_Giddy:: @ 82902F6
 	lock
 	faceplayer
-	msgbox MauvilleCity_PokemonCenter_1F_Text_29022F, MSGBOX_YESNO
+	msgbox MauvilleCity_PokemonCenter_1F_Text_HearMyStory, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290317
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29037A
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_290317:: @ 8290317
+MauvilleCity_PokemonCenter_1F_EventScript_TryTellTale:: @ 8290317
 	special ScrSpecial_GiddyShouldTellAnotherTale
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290359
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_290331:: @ 8290331
+MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale:: @ 8290331
 	special ScrSpecial_GiddyShouldTellAnotherTale
-	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_29034B
-	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290384
+	compare VAR_RESULT, TRUE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale
+	compare VAR_RESULT, FALSE
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_29034B:: @ 829034B
-	msgbox MauvilleCity_PokemonCenter_1F_Text_2902A7, MSGBOX_DEFAULT
-	goto MauvilleCity_PokemonCenter_1F_EventScript_290359
+MauvilleCity_PokemonCenter_1F_EventScript_GiddyStartNewTale:: @ 829034B
+	msgbox MauvilleCity_PokemonCenter_1F_Text_AlsoIWasThinking, MSGBOX_DEFAULT
+	goto MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_290359:: @ 8290359
+@ Regardless of whether yes or no is selected below, Giddy will continue to tell stories until he's told 10
+MauvilleCity_PokemonCenter_1F_EventScript_GiddyTellTale:: @ 8290359
 	special ScrSpecial_GenerateGiddyLine
 	special ShowFieldMessageStringVar4
 	waitmessage
 	yesnobox 20, 8
 	compare VAR_RESULT, 1
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale
 	compare VAR_RESULT, 0
-	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_290331
+	goto_if_eq MauvilleCity_PokemonCenter_1F_EventScript_TryTellNewTale
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_29037A:: @ 829037A
-	msgbox MauvilleCity_PokemonCenter_1F_Text_290281, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_DeclineGiddy:: @ 829037A
+	msgbox MauvilleCity_PokemonCenter_1F_Text_GiddyFeelingTheBlues, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_EventScript_290384:: @ 8290384
-	msgbox MauvilleCity_PokemonCenter_1F_Text_2902BD, MSGBOX_DEFAULT
+MauvilleCity_PokemonCenter_1F_EventScript_ToldEnoughTales:: @ 8290384
+	msgbox MauvilleCity_PokemonCenter_1F_Text_WeShouldChatAgain, MSGBOX_DEFAULT
 	release
 	end
 
-MauvilleCity_PokemonCenter_1F_Text_29038E: @ 829038E
+MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToHearMySong: @ 829038E
 	.string "Hi, I'm the BARD.\n"
 	.string "Would you like to hear my song?$"
 
-MauvilleCity_PokemonCenter_1F_Text_2903C0: @ 82903C0
+MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues1: @ 82903C0
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_2903E6: @ 82903E6
+MauvilleCity_PokemonCenter_1F_Text_WishICouldPlaySongForOthers: @ 82903E6
 	.string "Oh, what a moving song…\n"
 	.string "I wish I could play it for others…$"
 
-MauvilleCity_PokemonCenter_1F_Text_290421: @ 8290421
+MauvilleCity_PokemonCenter_1F_Text_WouldYouLikeToWriteSomeLyrics: @ 8290421
 	.string "So?\n"
 	.string "How do you like my song?\p"
 	.string "But I'm none too happy about\n"
@@ -964,38 +970,38 @@ MauvilleCity_PokemonCenter_1F_Text_290421: @ 8290421
 	.string "How would you like to write some\n"
 	.string "new lyrics for me?$"
 
-MauvilleCity_PokemonCenter_1F_Text_29049B: @ 829049B
+MauvilleCity_PokemonCenter_1F_Text_BardFeelingTheBlues2: @ 829049B
 	.string "Oh…\n"
 	.string "You've left me feeling the blues…$"
 
-MauvilleCity_PokemonCenter_1F_Text_2904C1: @ 82904C1
+MauvilleCity_PokemonCenter_1F_Text_LetMeSingItForYou: @ 82904C1
 	.string "Thank you kindly!\n"
 	.string "Let me sing it for you.$"
 
-MauvilleCity_PokemonCenter_1F_Text_2904EB: @ 82904EB
+MauvilleCity_PokemonCenter_1F_Text_ThatHowYouWantedSongToGo: @ 82904EB
 	.string "Was that how you wanted your song\n"
 	.string "to go?$"
 
-MauvilleCity_PokemonCenter_1F_Text_290514: @ 8290514
+MauvilleCity_PokemonCenter_1F_Text_IllSingThisSongForAWhile: @ 8290514
 	.string "Okay! That's it, then.\n"
 	.string "I'll sing this song for a while.$"
 
-MauvilleCity_PokemonCenter_1F_Text_29054C: @ 829054C
+MauvilleCity_PokemonCenter_1F_Text_TeachWhatsHipAndHappening: @ 829054C
 	.string "Hey, yo! They call me the HIPSTER.\n"
 	.string "I'll teach you what's hip and happening.$"
 
-MauvilleCity_PokemonCenter_1F_Text_290598: @ 8290598
+MauvilleCity_PokemonCenter_1F_Text_IAlreadyTaughtYou: @ 8290598
 	.string "But, hey, I taught you what's hip and\n"
 	.string "happening already.\p"
 	.string "I'd like to spread the good word to\n"
 	.string "other folks.$"
 
-MauvilleCity_PokemonCenter_1F_Text_290602: @ 8290602
+MauvilleCity_PokemonCenter_1F_Text_IveGotNothingNewToTeach: @ 8290602
 	.string "But, hey, you already know a lot about\n"
 	.string "what's hip and happening.\p"
 	.string "I've got nothing new to teach you!$"
 
-MauvilleCity_PokemonCenter_1F_Text_290666: @ 8290666
+MauvilleCity_PokemonCenter_1F_Text_HaveYouHeardOfPhrase: @ 8290666
 	.string "Hey, have you heard about\n"
 	.string "“{STR_VAR_1}”?\p"
 	.string "What's it mean? Well…\n"
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc
index c8cb84107..1df0ed88c 100644
--- a/data/scripts/mystery_event_club.inc
+++ b/data/scripts/mystery_event_club.inc
@@ -1,110 +1,110 @@
-PetalburgCity_PokemonCenter_1F_EventScript_291539:: @ 8291539
+MysteryEventClub_EventScript_Man:: @ 8291539
 	lock
 	faceplayer
-	goto_if_set FLAG_SYS_CHAT_USED, PetalburgCity_PokemonCenter_1F_EventScript_2915F5
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291687, MSGBOX_DEFAULT
-	goto PetalburgCity_PokemonCenter_1F_EventScript_291552
+	goto_if_set FLAG_SYS_CHAT_USED, MysteryEventClub_EventScript_2915F5
+	msgbox MysteryEventClub_Text_CollectTrainerProfiles, MSGBOX_DEFAULT
+	goto MysteryEventClub_EventScript_291552
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_291552:: @ 8291552
-	msgbox PetalburgCity_PokemonCenter_1F_Text_2916FF, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_291552:: @ 8291552
+	msgbox MysteryEventClub_Text_2916FF, MSGBOX_DEFAULT
 	multichoice 17, 6, MULTI_YESNOINFO_2, 0
 	switch VAR_RESULT
-	case 0, PetalburgCity_PokemonCenter_1F_EventScript_29159F
-	case 1, PetalburgCity_PokemonCenter_1F_EventScript_2915EB
-	case 2, PetalburgCity_PokemonCenter_1F_EventScript_291591
-	case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_2915EB
+	case 0, MysteryEventClub_EventScript_29159F
+	case 1, MysteryEventClub_EventScript_2915EB
+	case 2, MysteryEventClub_EventScript_291591
+	case MULTI_B_PRESSED, MysteryEventClub_EventScript_2915EB
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_291591:: @ 8291591
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT
-	goto PetalburgCity_PokemonCenter_1F_EventScript_291552
+MysteryEventClub_EventScript_291591:: @ 8291591
+	msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
+	goto MysteryEventClub_EventScript_291552
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_29159F:: @ 829159F
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291969, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_29159F:: @ 829159F
+	msgbox MysteryEventClub_Text_291969, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB
+	goto_if_eq MysteryEventClub_EventScript_2915CB
 	compare VAR_RESULT, 1
-	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5
+	goto_if_eq MysteryEventClub_EventScript_2915D5
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_2915CB:: @ 82915CB
-	msgbox PetalburgCity_PokemonCenter_1F_Text_2919DC, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_2915CB:: @ 82915CB
+	msgbox MysteryEventClub_Text_2919DC, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_2915D5:: @ 82915D5
+MysteryEventClub_EventScript_2915D5:: @ 82915D5
 	setvar VAR_0x8004, 0
 	special sub_811EECC
 	waitmessage
 	delay 80
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291B22, MSGBOX_DEFAULT
+	msgbox MysteryEventClub_Text_291B22, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_2915EB:: @ 82915EB
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291991, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_2915EB:: @ 82915EB
+	msgbox MysteryEventClub_Text_291991, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_2915F5:: @ 82915F5
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291A1B, MSGBOX_DEFAULT
-	goto PetalburgCity_PokemonCenter_1F_EventScript_291603
+MysteryEventClub_EventScript_2915F5:: @ 82915F5
+	msgbox MysteryEventClub_Text_YouHaveWonderfulSmile, MSGBOX_DEFAULT
+	goto MysteryEventClub_EventScript_291603
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_291603:: @ 8291603
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291A4F, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_291603:: @ 8291603
+	msgbox MysteryEventClub_Text_MayISeeYourNewProfile, MSGBOX_DEFAULT
 	multichoice 17, 6, MULTI_YESNOINFO_2, 0
 	switch VAR_RESULT
-	case 0, PetalburgCity_PokemonCenter_1F_EventScript_291650
-	case 1, PetalburgCity_PokemonCenter_1F_EventScript_29167C
-	case 2, PetalburgCity_PokemonCenter_1F_EventScript_291642
-	case MULTI_B_PRESSED, PetalburgCity_PokemonCenter_1F_EventScript_29167C
+	case 0, MysteryEventClub_EventScript_291650
+	case 1, MysteryEventClub_EventScript_29167C
+	case 2, MysteryEventClub_EventScript_291642
+	case MULTI_B_PRESSED, MysteryEventClub_EventScript_29167C
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_291642:: @ 8291642
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291729, MSGBOX_DEFAULT
-	goto PetalburgCity_PokemonCenter_1F_EventScript_291603
+MysteryEventClub_EventScript_291642:: @ 8291642
+	msgbox MysteryEventClub_Text_EasyChatExplanation, MSGBOX_DEFAULT
+	goto MysteryEventClub_EventScript_291603
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_291650:: @ 8291650
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291A6B, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_291650:: @ 8291650
+	msgbox MysteryEventClub_Text_291A6B, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE
 	call Common_ShowEasyChatScreen
 	lock
 	faceplayer
 	compare VAR_RESULT, 0
-	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915CB
+	goto_if_eq MysteryEventClub_EventScript_2915CB
 	compare VAR_RESULT, 1
-	goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_2915D5
+	goto_if_eq MysteryEventClub_EventScript_2915D5
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_29167C:: @ 829167C
-	msgbox PetalburgCity_PokemonCenter_1F_Text_291ABA, MSGBOX_DEFAULT
+MysteryEventClub_EventScript_29167C:: @ 829167C
+	msgbox MysteryEventClub_Text_291ABA, MSGBOX_DEFAULT
 	release
 	end
 
-PetalburgCity_PokemonCenter_1F_EventScript_291686:: @ 8291686
+MysteryEventClub_EventScript_291686:: @ 8291686
 	return
 
-PetalburgCity_PokemonCenter_1F_Text_291687: @ 8291687
+MysteryEventClub_Text_CollectTrainerProfiles: @ 8291687
 	.string "Hello there, TRAINER!\n"
 	.string "You've got a wonderful smile, there.\p"
 	.string "I have a hobby--collecting the profiles\n"
 	.string "of POKéMON TRAINERS.$"
 
-PetalburgCity_PokemonCenter_1F_Text_2916FF: @ 82916FF
+MysteryEventClub_Text_2916FF: @ 82916FF
 	.string "So, how about it?\n"
 	.string "May I see your profile?$"
 
-PetalburgCity_PokemonCenter_1F_Text_291729: @ 8291729
+MysteryEventClub_Text_EasyChatExplanation: @ 8291729
 	.string "You make your own profile by putting\n"
 	.string "together four words or phrases.\p"
 	.string "Here, I'll show you an example of a\n"
@@ -123,37 +123,37 @@ PetalburgCity_PokemonCenter_1F_Text_291729: @ 8291729
 	.string "Repeat for the remaining text choices,\n"
 	.string "and you'll have your very own profile.$"
 
-PetalburgCity_PokemonCenter_1F_Text_291969: @ 8291969
+MysteryEventClub_Text_291969: @ 8291969
 	.string "Yes! Thank you!\n"
 	.string "So, let's see it, then.$"
 
-PetalburgCity_PokemonCenter_1F_Text_291991: @ 8291991
+MysteryEventClub_Text_291991: @ 8291991
 	.string "Oh, no, really?\p"
 	.string "I imagine someone like you would have\n"
 	.string "a wonderful profile…$"
 
-PetalburgCity_PokemonCenter_1F_Text_2919DC: @ 82919DC
+MysteryEventClub_Text_2919DC: @ 82919DC
 	.string "Oh? You're not into it right now?\p"
 	.string "Well, anytime is good by me!$"
 
-PetalburgCity_PokemonCenter_1F_Text_291A1B: @ 8291A1B
+MysteryEventClub_Text_YouHaveWonderfulSmile: @ 8291A1B
 	.string "Hello there, TRAINER!\n"
 	.string "You've got a wonderful smile.$"
 
-PetalburgCity_PokemonCenter_1F_Text_291A4F: @ 8291A4F
+MysteryEventClub_Text_MayISeeYourNewProfile: @ 8291A4F
 	.string "May I see your new profile?$"
 
-PetalburgCity_PokemonCenter_1F_Text_291A6B: @ 8291A6B
+MysteryEventClub_Text_291A6B: @ 8291A6B
 	.string "Yes! Thank you!\p"
 	.string "I hope it's even better than the profile\n"
 	.string "you showed me before.$"
 
-PetalburgCity_PokemonCenter_1F_Text_291ABA: @ 8291ABA
+MysteryEventClub_Text_291ABA: @ 8291ABA
 	.string "Oh, you like your profile the way it is.\p"
 	.string "I don't blame you--it's a wonderful\n"
 	.string "profile the way it is now.$"
 
-PetalburgCity_PokemonCenter_1F_Text_291B22: @ 8291B22
+MysteryEventClub_Text_291B22: @ 8291B22
 	.string "F-fantastic!\p"
 	.string "Your profile, it's wonderful!\n"
 	.string "It really says what you're about.\p"
@@ -161,7 +161,7 @@ PetalburgCity_PokemonCenter_1F_Text_291B22: @ 8291B22
 	.string "be captivated by you!\p"
 	.string "Thank you!$"
 
-PetalburgCity_PokemonCenter_1F_Text_291BB7: @ 8291BB7
+MysteryEventClub_Text_291BB7: @ 8291BB7
 	.string "Oh?\n"
 	.string "You know the secret saying!\p"
 	.string "That means you're now a fellow member\n"
diff --git a/data/scripts/new_game.inc b/data/scripts/new_game.inc
index 5bc4bf780..c88208708 100644
--- a/data/scripts/new_game.inc
+++ b/data/scripts/new_game.inc
@@ -102,7 +102,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_BRINEYS_HOUSE_PEEKO
 	setflag FLAG_HIDE_ROUTE_104_MR_BRINEY
 	setflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN
-	setflag FLAG_HIDE_ROUTE_108_MR_BRINEY
+	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY
 	setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN
 	setflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT
 	setflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST
@@ -117,7 +117,7 @@ EventScript_ResetAllMapFlags:: @ 82715DE
 	setflag FLAG_HIDE_PETALBURG_GYM_GREETER
 	setflag FLAG_HIDE_PETALBURG_GYM_WALLYS_UNCLE
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN
-	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN
+	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_MAY
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM
 	setflag FLAG_HIDE_PLAYERS_HOUSE_DAD
diff --git a/data/scripts/obtain_item.inc b/data/scripts/obtain_item.inc
new file mode 100644
index 000000000..206277cb7
--- /dev/null
+++ b/data/scripts/obtain_item.inc
@@ -0,0 +1,208 @@
+Std_ObtainItem:: @ 8271AD3
+	giveitem VAR_0x8000, VAR_0x8001
+	copyvar VAR_0x8007, VAR_RESULT
+	call EventScript_ObtainItemMessage
+	return
+
+EventScript_ObtainItemMessage:: @ 8271AE3
+	bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
+	checkitemtype VAR_0x8000
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, 1
+	call_if_eq EventScript_ObtainedItem
+	compare VAR_0x8007, 0
+	call_if_eq EventScript_NoRoomForItem
+	return
+
+EventScript_BufferPocketNameAndTryFanfare:: @ 8271B08
+	switch VAR_RESULT
+	case POCKET_ITEMS, EventScript_BufferItemsPocket
+	case POCKET_KEY_ITEMS, EventScript_BufferKeyItemsPocket
+	case POCKET_POKE_BALLS, EventScript_BufferPokeballsPocket
+	case POCKET_TM_HM, EventScript_BufferTMHMsPocket
+	case POCKET_BERRIES, EventScript_BufferBerriesPocket
+	end
+
+EventScript_BufferItemsPocket:: @ 8271B45
+	bufferstdstring 2, STDSTRING_ITEMS
+	compare VAR_0x8007, 1
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferKeyItemsPocket:: @ 8271B55
+	bufferstdstring 2, STDSTRING_KEYITEMS
+	compare VAR_0x8007, 1
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferPokeballsPocket:: @ 8271B65
+	bufferstdstring 2, STDSTRING_POKEBALLS
+	compare VAR_0x8007, 1
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_BufferTMHMsPocket:: @ 8271B75
+	bufferstdstring 2, STDSTRING_TMHMS
+	compare VAR_0x8007, 1
+	call_if_eq EventScript_PlayFanfareObtainedTMHM
+	return
+
+EventScript_BufferBerriesPocket:: @ 8271B85
+	bufferstdstring 2, STDSTRING_BERRIES
+	compare VAR_0x8007, 1
+	call_if_eq EventScript_PlayFanfareObtainedItem
+	return
+
+EventScript_ObtainedItem:: @ 8271B95
+	message gText_ObtainedTheItem
+	waitfanfare
+	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
+	setvar VAR_RESULT, 1
+	return
+
+EventScript_NoRoomForItem:: @ 8271BA9
+	setvar VAR_RESULT, 0
+	return
+
+EventScript_PlayFanfareObtainedItem:: @ 8271BAF
+	playfanfare MUS_FANFA4
+	return
+
+EventScript_PlayFanfareObtainedTMHM:: @ 8271BB3
+	playfanfare MUS_ME_WAZA
+	return
+
+Std_ObtainDecoration:: @ 8271BB7
+	givedecoration VAR_0x8000
+	copyvar VAR_0x8007, VAR_RESULT
+	call EventScript_ObtainDecorationMessage
+	return
+
+EventScript_ObtainDecorationMessage:: @ 8271BC5
+	bufferdecorationname 1, VAR_0x8000
+	compare VAR_0x8007, 1
+	call_if_eq EventScript_ObtainedDecor
+	compare VAR_0x8007, 0
+	call_if_eq EventScript_NoRoomForDecor
+	return
+
+EventScript_ObtainedDecor:: @ 8271BE0
+	playfanfare MUS_FANFA4
+	message gText_ObtainedTheDecor
+	waitfanfare
+	msgbox gText_TheDecorWasTransferredToThePC, MSGBOX_DEFAULT
+	setvar VAR_RESULT, 1
+	return
+
+EventScript_NoRoomForDecor:: @ 8271BF7
+	setvar VAR_RESULT, 0
+	return
+
+Std_FindItem:: @ 8271BFD
+	lock
+	faceplayer
+	waitse
+	copyvar VAR_0x8004, VAR_0x8000
+	copyvar VAR_0x8005, VAR_0x8001
+	checkitemspace VAR_0x8000, VAR_0x8001
+	copyvar VAR_0x8007, VAR_RESULT
+	bufferitemnameplural 1, VAR_0x8000, VAR_0x8001
+	checkitemtype VAR_0x8000
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, 1
+	call_if_eq EventScript_PickUpItem
+	compare VAR_0x8007, 0
+	call_if_eq EventScript_NoRoomToPickUpItem
+	release
+	return
+
+EventScript_PickUpItem:: @ 8271C3A
+	removeobject VAR_LAST_TALKED
+	giveitem VAR_0x8004, VAR_0x8005
+	specialvar VAR_RESULT, BufferTMHMMoveName
+	copyvar VAR_0x8008, VAR_RESULT
+	compare VAR_0x8008, 1
+	call_if_eq EventScript_FoundTMHM
+	compare VAR_0x8008, 0
+	call_if_eq EventScript_FoundItem
+	waitfanfare
+	waitmessage
+	bufferitemnameplural 1, VAR_0x8004, VAR_0x8005
+	setvar VAR_0x8004, BATTLE_PYRAMID_FUNC_IS_IN
+	special CallBattlePyramidFunction
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_PutBattlePyramidItemInBag
+	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
+	return
+
+EventScript_PutBattlePyramidItemInBag:: @ 8271C86
+	msgbox gText_PlayerPutItemInBag, MSGBOX_DEFAULT
+	return
+
+EventScript_FoundTMHM:: @ 8271C8F
+	bufferitemnameplural 0, VAR_0x8004, VAR_0x8005
+	message gText_PlayerFoundOneTMHM
+	return
+
+EventScript_FoundItem:: @ 8271C9B
+	message gText_PlayerFoundOneItem
+	return
+
+EventScript_NoRoomToPickUpItem:: @ 8271CA1
+	msgbox gText_ObtainedTheItem, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
+	setvar VAR_RESULT, 0
+	return
+
+EventScript_HiddenItemScript:: @ 8271CB7
+	lockall
+	waitse
+	giveitem VAR_0x8005, 1
+	copyvar VAR_0x8007, VAR_RESULT
+	bufferitemnameplural 1, VAR_0x8005, 1
+	checkitemtype VAR_0x8005
+	call EventScript_BufferPocketNameAndTryFanfare
+	compare VAR_0x8007, 1
+	goto_if_eq EventScript_PickUpHiddenItem
+	compare VAR_0x8007, 0
+	goto_if_eq EventScript_NoRoomForHiddenItem
+	end
+
+EventScript_PickUpHiddenItem:: @ 8271CE8
+	copyvar VAR_0x8008, VAR_0x8004
+	copyvar VAR_0x8004, VAR_0x8005
+	specialvar VAR_RESULT, BufferTMHMMoveName
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_FoundHiddenTMHM
+	compare VAR_RESULT, 0
+	goto_if_eq EventScript_FoundHiddenItem
+	end
+
+EventScript_FoundHiddenTMHM:: @ 8271D0E
+	bufferitemnameplural 0, VAR_0x8004, 1
+	message gText_PlayerFoundOneTMHM
+	goto EventScript_PutHiddenItemInPocket
+	end
+
+EventScript_FoundHiddenItem:: @ 8271D1F
+	message gText_PlayerFoundOneItem
+	goto EventScript_PutHiddenItemInPocket
+	end
+
+EventScript_PutHiddenItemInPocket:: @ 8271D2A
+	waitmessage
+	waitfanfare
+	bufferitemnameplural 1, VAR_0x8004, 1
+	copyvar VAR_0x8004, VAR_0x8008
+	msgbox gText_PutItemInPocket, MSGBOX_DEFAULT
+	special TryPutTreasureInvestigatorsOnAir
+	special SetHiddenItemFlag
+	releaseall
+	end
+
+EventScript_NoRoomForHiddenItem:: @ 8271D47
+	msgbox gText_PlayerFoundOneItem, MSGBOX_DEFAULT
+	msgbox gText_TooBadBagIsFull, MSGBOX_DEFAULT
+	setvar VAR_RESULT, 0
+	releaseall
+	end
diff --git a/data/scripts/pc_transfer.inc b/data/scripts/pc_transfer.inc
new file mode 100644
index 000000000..594956a31
--- /dev/null
+++ b/data/scripts/pc_transfer.inc
@@ -0,0 +1,52 @@
+@ VAR_0x8004 here is used by ChangePokemonNickname
+Common_EventScript_GetGiftMonPartySlot:: @ 827378B
+	getpartysize
+	subvar VAR_RESULT, 1
+	copyvar VAR_0x8004, VAR_RESULT
+	return
+
+Common_EventScript_NameReceivedBoxMon:: @ 8273797
+	fadescreen 1
+	special ChangeBoxPokemonNickname
+	waitstate
+	lock
+	faceplayer
+	return
+
+Common_EventScript_TransferredToPC:: @ 82737A0
+	bufferboxname 0, VAR_PC_BOX_TO_SEND_MON
+	bufferspeciesname 1, VAR_TEMP_1
+	call_if_unset FLAG_SYS_PC_LANETTE, EventScript_TransferredSomeonesPC
+	call_if_set FLAG_SYS_PC_LANETTE, EventScript_TransferredLanettesPC
+	return
+
+EventScript_TransferredSomeonesPC:: @ 82737BB
+	specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_SomeonesPCBoxFull
+	msgbox gText_PkmnTransferredSomeonesPC, MSGBOX_DEFAULT
+	return
+
+EventScript_SomeonesPCBoxFull:: @ 82737D4
+	specialvar VAR_RESULT, GetPCBoxToSendMon
+	bufferboxname 2, VAR_RESULT
+	msgbox gText_PkmnTransferredSomeonesPCBoxFull, MSGBOX_DEFAULT
+	return
+
+EventScript_TransferredLanettesPC:: @ 82737E6
+	specialvar VAR_RESULT, ShouldShowBoxWasFullMessage
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_LanettesPCBoxFull
+	msgbox gText_PkmnTransferredLanettesPC, MSGBOX_DEFAULT
+	return
+
+EventScript_LanettesPCBoxFull:: @ 82737FF
+	specialvar VAR_RESULT, GetPCBoxToSendMon
+	bufferboxname 2, VAR_RESULT
+	msgbox gText_PkmnTransferredLanettesPCBoxFull, MSGBOX_DEFAULT
+	return
+
+Common_EventScript_NoMoreRoomForPokemon:: @ 8273811
+	msgbox gText_NoMoreRoomForPokemon, MSGBOX_DEFAULT
+	release
+	end
diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc
index f88d3af6c..acb1536e8 100644
--- a/data/scripts/players_house.inc
+++ b/data/scripts/players_house.inc
@@ -1,67 +1,63 @@
-LittlerootTown_BrendansHouse_2F_EventScript_2926FE:: @ 82926FE
-LittlerootTown_MaysHouse_2F_EventScript_2926FE:: @ 82926FE
+PlayersHouse_2F_EventScript_BlockStairsUntilClockIsSet:: @ 82926FE
 	setvar VAR_LITTLEROOT_INTRO_STATE, 5
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292704:: @ 8292704
-LittlerootTown_MaysHouse_1F_EventScript_292704:: @ 8292704
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
+PlayersHouse_1F_EventScript_EnterHouseMovingIn:: @ 8292704
+	msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT
 	applymovement VAR_0x8004, Common_Movement_FacePlayer
 	waitmovement 0
-	compare VAR_0x8005, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_29274D
-	compare VAR_0x8005, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292758
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A46, MSGBOX_DEFAULT
+	compare VAR_0x8005, MALE
+	call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale
+	compare VAR_0x8005, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale
+	msgbox PlayersHouse_1F_Text_MoversPokemonGoSetClock, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_LITTLEROOT_INTRO_STATE, 4
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292763
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerWalkIn
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_29274D:: @ 829274D
+PlayersHouse_1F_EventScript_MomFacePlayerMovingInMale:: @ 829274D
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292758:: @ 8292758
+PlayersHouse_1F_EventScript_MomFacePlayerMovingInFemale:: @ 8292758
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_Movement_292763: @ 8292763
+PlayersHouse_1F_Movement_PlayerWalkIn: @ 8292763
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292765:: @ 8292765
-LittlerootTown_MaysHouse_1F_EventScript_292765:: @ 8292765
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B24, MSGBOX_DEFAULT
+PlayersHouse_1F_EventScript_MomGoSeeRoom:: @ 8292765
+	msgbox PlayersHouse_1F_Text_ArentYouInterestedInRoom, MSGBOX_DEFAULT
 	closemessage
 	applymovement VAR_0x8004, Common_Movement_WalkInPlaceFastestUp
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AF0
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MovePlayerAwayFromDoor
 	waitmovement 0
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_292781:: @ 8292781
+LittlerootTown_BrendansHouse_2F_EventScript_WallClock:: @ 8292781
 	lockall
-	setvar VAR_0x8004, 0
-	goto LittlerootTown_BrendansHouse_2F_EventScript_292799
+	setvar VAR_0x8004, MALE
+	goto PlayersHouse_2F_EventScript_WallClock
 	end
 
-LittlerootTown_MaysHouse_2F_EventScript_29278D:: @ 829278D
+LittlerootTown_MaysHouse_2F_EventScript_WallClock:: @ 829278D
 	lockall
-	setvar VAR_0x8004, 1
-	goto LittlerootTown_MaysHouse_2F_EventScript_292799
+	setvar VAR_0x8004, FEMALE
+	goto PlayersHouse_2F_EventScript_WallClock
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799
-LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
-	goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_29283F
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT
-	call LittlerootTown_BrendansHouse_2F_EventScript_292849
+PlayersHouse_2F_EventScript_WallClock:: @ 8292799
+	goto_if_set FLAG_SET_WALL_CLOCK, PlayersHouse_2F_EventScript_CheckWallClock
+	msgbox PlayersHouse_2F_Text_ClockIsStopped, MSGBOX_DEFAULT
+	call PlayersHouse_2F_EventScript_SetWallClock
 	delay 30
 	setvar VAR_LITTLEROOT_INTRO_STATE, 6
 	setflag FLAG_SET_WALL_CLOCK
@@ -69,41 +65,41 @@ LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799
 	setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_2927DF
+	call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_29280F
+	call_if_eq PlayersHouse_2F_EventScript_MomComesUpstairsFemale
 	playse SE_KAIDAN
 	removeobject VAR_0x8008
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_2927DF:: @ 82927DF
+PlayersHouse_2F_EventScript_MomComesUpstairsMale:: @ 82927DF
 	setvar VAR_0x8008, 14
 	addobject VAR_0x8008
-	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292850
+	applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersMale
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
+	msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292857
+	applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsMale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_29280F:: @ 829280F
+PlayersHouse_2F_EventScript_MomComesUpstairsFemale:: @ 829280F
 	setvar VAR_0x8008, 14
 	addobject VAR_0x8008
-	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_29285B
+	applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomEntersFemale
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_2F_Text_1F869A, MSGBOX_DEFAULT
+	msgbox PlayersHouse_2F_Text_HowDoYouLikeYourRoom, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8008, LittlerootTown_BrendansHouse_2F_Movement_292862
+	applymovement VAR_0x8008, PlayersHouse_2F_Movement_MomExitsFemale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F
+PlayersHouse_2F_EventScript_CheckWallClock:: @ 829283F
 	incrementgamestat GAME_STAT_CHECKED_CLOCK
 	fadescreen 1
 	special Special_ViewWallClock
@@ -111,13 +107,13 @@ LittlerootTown_BrendansHouse_2F_EventScript_29283F:: @ 829283F
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_2F_EventScript_292849:: @ 8292849
+PlayersHouse_2F_EventScript_SetWallClock:: @ 8292849
 	fadescreen 1
 	special StartWallClock
 	waitstate
 	return
 
-LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850
+PlayersHouse_2F_Movement_MomEntersMale: @ 8292850
 	delay_8
 	walk_down
 	walk_in_place_fastest_left
@@ -126,13 +122,13 @@ LittlerootTown_BrendansHouse_2F_Movement_292850: @ 8292850
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_292857: @ 8292857
+PlayersHouse_2F_Movement_MomExitsMale: @ 8292857
 	walk_right
 	walk_up
 	delay_8
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B
+PlayersHouse_2F_Movement_MomEntersFemale: @ 829285B
 	delay_8
 	walk_down
 	walk_in_place_fastest_right
@@ -141,91 +137,88 @@ LittlerootTown_BrendansHouse_2F_Movement_29285B: @ 829285B
 	walk_right
 	step_end
 
-LittlerootTown_BrendansHouse_2F_Movement_292862: @ 8292862
+PlayersHouse_2F_Movement_MomExitsFemale: @ 8292862
 	walk_left
 	walk_up
 	delay_8
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292866:: @ 8292866
-LittlerootTown_MaysHouse_1F_EventScript_292866:: @ 8292866
+PlayersHouse_1F_EventScript_SetWatchedBroadcast:: @ 8292866
 	setvar VAR_LITTLEROOT_INTRO_STATE, 7
 	releaseall
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_29286D:: @ 829286D
+PlayersHouse_1F_EventScript_PetalburgGymReportMale:: @ 829286D
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	call LittlerootTown_BrendansHouse_1F_EventScript_29294B
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE0
+	call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymMale
 	waitmovement 0
 	playbgm MUS_INTER_V, 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929B7
+	applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292AE6
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVMale
 	waitmovement 0
-	call LittlerootTown_BrendansHouse_1F_EventScript_29296C
+	call PlayersHouse_1F_EventScript_WatchGymBroadcast
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_1, 1
-	applymovement VAR_0x8005, LittlerootTown_BrendansHouse_1F_Movement_2929BD
+	applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatMale
 	waitmovement 0
-	goto LittlerootTown_BrendansHouse_1F_EventScript_292866
+	goto PlayersHouse_1F_EventScript_SetWatchedBroadcast
 	end
 
-LittlerootTown_MaysHouse_1F_EventScript_2928DC:: @ 82928DC
+PlayersHouse_1F_EventScript_PetalburgGymReportFemale:: @ 82928DC
 	applymovement VAR_0x8005, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
-	call LittlerootTown_MaysHouse_1F_EventScript_29294B
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AE8
+	call PlayersHouse_1F_EventScript_MomNoticeGymBroadcast
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale
 	waitmovement 0
 	playbgm MUS_INTER_V, 0
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F7BBC, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_MaybeDadWillBeOn, MSGBOX_DEFAULT
 	closemessage
-	applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929BA
+	applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale
 	waitmovement 0
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_MaysHouse_1F_Movement_292AEE
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerMoveToTVFemale
 	waitmovement 0
-	call LittlerootTown_MaysHouse_1F_EventScript_29296C
+	call PlayersHouse_1F_EventScript_WatchGymBroadcast
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F7BF1, MSGBOX_DEFAULT
-	msgbox LittlerootTown_MaysHouse_1F_Text_1F7C35, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_ItsOverWeMissedHim, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_GoIntroduceYourselfNextDoor, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_TEMP_1, 1
-	applymovement VAR_0x8005, LittlerootTown_MaysHouse_1F_Movement_2929C1
+	applymovement VAR_0x8005, PlayersHouse_1F_Movement_MomReturnToSeatFemale
 	waitmovement 0
-	goto LittlerootTown_MaysHouse_1F_EventScript_292866
+	goto PlayersHouse_1F_EventScript_SetWatchedBroadcast
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_29294B:: @ 829294B
-LittlerootTown_MaysHouse_1F_EventScript_29294B:: @ 829294B
+PlayersHouse_1F_EventScript_MomNoticeGymBroadcast:: @ 829294B
 	playse SE_PIN
 	applymovement VAR_0x8005, Common_Movement_ExclamationMark
 	waitmovement 0
 	applymovement VAR_0x8005, Common_Movement_Delay48
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7B96, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_OhComeQuickly, MSGBOX_DEFAULT
 	closemessage
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_29296C:: @ 829296C
-LittlerootTown_MaysHouse_1F_EventScript_29296C:: @ 829296C
+PlayersHouse_1F_EventScript_WatchGymBroadcast:: @ 829296C
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestUp
 	waitmovement 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EC6, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_ReportFromPetalburgGym, MSGBOX_DEFAULT
 	fadedefaultbgm
 	special TurnOffTVScreen
 	setflag FLAG_SYS_TV_HOME
 	delay 35
 	return
 
-LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989
+PlayersHouse_1F_Movement_MomApproachDadMale: @ 8292989
 	walk_up
 	walk_right
 	walk_right
@@ -235,7 +228,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292989: @ 8292989
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991
+PlayersHouse_1F_Movement_MomApproachDadFemale: @ 8292991
 	walk_up
 	walk_left
 	walk_left
@@ -245,15 +238,15 @@ LittlerootTown_BrendansHouse_1F_Movement_292991: @ 8292991
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292999: @ 8292999
+PlayersHouse_1F_Movement_MomApproachPlayerMale: @ 8292999
 	walk_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_29299B: @ 829299B
+PlayersHouse_1F_Movement_MomApproachPlayerFemale: @ 829299B
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D
+PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale: @ 829299D
 	walk_in_place_fastest_left
 	delay_16
 	delay_16
@@ -264,7 +257,7 @@ LittlerootTown_BrendansHouse_1F_Movement_29299D: @ 829299D
 	delay_16
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6
+PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale: @ 82929A6
 	walk_in_place_fastest_right
 	delay_16
 	delay_16
@@ -275,70 +268,69 @@ LittlerootTown_BrendansHouse_1F_Movement_2929A6: @ 82929A6
 	delay_16
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_2929AF: @ 82929AF
+PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale: @ 82929AF
 	walk_up
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_2929B3: @ 82929B3
+PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale: @ 82929B3
 	walk_up
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_2929B7: @ 82929B7
+PlayersHouse_1F_Movement_MomMakeRoomToSeeTVMale: @ 82929B7
 	walk_left
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_2929BA: @ 82929BA
+PlayersHouse_1F_Movement_MomMakeRoomToSeeTVFemale: @ 82929BA
 	walk_right
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_2929BD: @ 82929BD
+PlayersHouse_1F_Movement_MomReturnToSeatMale: @ 82929BD
 	walk_left
 	walk_down
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_2929C1: @ 82929C1
+PlayersHouse_1F_Movement_MomReturnToSeatFemale: @ 82929C1
 	walk_right
 	walk_down
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_2929C5:: @ 82929C5
-LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5
+PlayersHouse_1F_EventScript_Mom:: @ 82929C5
 	lock
 	faceplayer
 	compare VAR_LITTLEROOT_HOUSES_STATE, 4
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
+	goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
 	compare VAR_LITTLEROOT_HOUSES_STATE_2, 4
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F
-	goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19
-	goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86
+	goto_if_eq PlayersHouse_1F_EventScript_DontPushYourselfTooHard
+	goto_if_set FLAG_HAS_MATCH_CALL, PlayersHouse_1F_EventScript_TryRegisterMom
+	goto_if_set FLAG_RESCUED_BIRCH, PlayersHouse_1F_EventScript_MomHealsParty
 	compare VAR_TEMP_1, 1
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94
+	goto_if_eq PlayersHouse_1F_EventScript_SeeYouHoney
 	compare VAR_LITTLEROOT_INTRO_STATE, 7
-	goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292AB0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7A1C, MSGBOX_DEFAULT
+	goto_if_eq PlayersHouse_1F_EventScript_DidYouMeetProfBirch
+	msgbox PlayersHouse_1F_Text_IsntItNiceInHere, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
+PlayersHouse_1F_EventScript_DontPushYourselfTooHard:: @ 8292A0F
+	msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19
-	goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A43
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT
+PlayersHouse_1F_EventScript_TryRegisterMom:: @ 8292A19
+	goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, PlayersHouse_1F_EventScript_CheckGiveAmuletCoin
+	msgbox PlayersHouse_1F_Text_IsThatAPokenav, MSGBOX_DEFAULT
 	closemessage
 	delay 30
 	playfanfare MUS_ME_TORE_EYE
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E89, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_RegisteredMom, MSGBOX_DEFAULT
 	waitfanfare
 	closemessage
 	delay 30
@@ -346,67 +338,65 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43
-	goto_if_set FLAG_BADGE05_GET, LittlerootTown_BrendansHouse_1F_EventScript_292A51
-	goto LittlerootTown_BrendansHouse_1F_EventScript_292A86
+PlayersHouse_1F_EventScript_CheckGiveAmuletCoin:: @ 8292A43
+	goto_if_set FLAG_BADGE05_GET, PlayersHouse_1F_EventScript_TryGiveAmuletCoin
+	goto PlayersHouse_1F_EventScript_MomHealsParty
 
-LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51
-	goto_if_set FLAG_MOM_SAYS_GOODBYE, LittlerootTown_BrendansHouse_1F_EventScript_292A86
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT
+PlayersHouse_1F_EventScript_TryGiveAmuletCoin:: @ 8292A51
+	goto_if_set FLAG_RECEIVED_AMULET_COIN, PlayersHouse_1F_EventScript_MomHealsParty
+	msgbox PlayersHouse_1F_Text_GotDadsBadgeHeresSomethingFromMom, MSGBOX_DEFAULT
 	giveitem_std ITEM_AMULET_COIN
 	compare VAR_RESULT, 0
 	goto_if_eq Common_EventScript_ShowBagIsFull
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT
-	setflag FLAG_MOM_SAYS_GOODBYE
+	msgbox PlayersHouse_1F_Text_DontPushYourselfTooHard, MSGBOX_DEFAULT
+	setflag FLAG_RECEIVED_AMULET_COIN
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292A86:: @ 8292A86
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D08, MSGBOX_DEFAULT
-	goto LittlerootTown_BrendansHouse_1F_EventScript_292A9E
+PlayersHouse_1F_EventScript_MomHealsParty:: @ 8292A86
+	msgbox PlayersHouse_1F_Text_YouShouldRestABit, MSGBOX_DEFAULT
+	goto PlayersHouse_1F_EventScript_HealParty
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292A94:: @ 8292A94
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CC3, MSGBOX_DEFAULT
+PlayersHouse_1F_EventScript_SeeYouHoney:: @ 8292A94
+	msgbox PlayersHouse_1F_Text_SeeYouHoney, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292A9E:: @ 8292A9E
+PlayersHouse_1F_EventScript_HealParty:: @ 8292A9E
 	closemessage
 	call Common_EventScript_OutOfCenterPartyHeal
 	incrementgamestat GAME_STAT_RESTED_AT_HOME
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D5C, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_TakeCareHoney, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292AB0:: @ 8292AB0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7CD8, MSGBOX_DEFAULT
+PlayersHouse_1F_EventScript_DidYouMeetProfBirch:: @ 8292AB0
+	msgbox PlayersHouse_1F_Text_DidYouMeetProfBirch, MSGBOX_DEFAULT
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292ABA:: @ 8292ABA
-LittlerootTown_MaysHouse_1F_EventScript_292ABA:: @ 8292ABA
+PlayersHouse_1F_EventScript_Vigoroth1:: @ 8292ABA
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_VIGOROTH, 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EA8, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_Vigoroth1, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292ACD:: @ 8292ACD
-LittlerootTown_MaysHouse_1F_EventScript_292ACD:: @ 8292ACD
+PlayersHouse_1F_EventScript_Vigoroth2:: @ 8292ACD
 	lock
 	faceplayer
 	waitse
 	playmoncry SPECIES_VIGOROTH, 0
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7EB3, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_Vigoroth2, MSGBOX_DEFAULT
 	waitmoncry
 	release
 	end
 
-LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0
+PlayersHouse_1F_Movement_PlayerApproachTVForGymMale: @ 8292AE0
 	walk_down
 	walk_down
 	walk_left
@@ -414,11 +404,11 @@ LittlerootTown_BrendansHouse_1F_Movement_292AE0: @ 8292AE0
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292AE6: @ 8292AE6
+PlayersHouse_1F_Movement_PlayerMoveToTVMale: @ 8292AE6
 	walk_left
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8
+PlayersHouse_1F_Movement_PlayerApproachTVForGymFemale: @ 8292AE8
 	walk_down
 	walk_down
 	walk_right
@@ -426,26 +416,25 @@ LittlerootTown_MaysHouse_1F_Movement_292AE8: @ 8292AE8
 	walk_right
 	step_end
 
-LittlerootTown_MaysHouse_1F_Movement_292AEE: @ 8292AEE
+PlayersHouse_1F_Movement_PlayerMoveToTVFemale: @ 8292AEE
 	walk_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292AF0: @ 8292AF0
+PlayersHouse_1F_Movement_MovePlayerAwayFromDoor: @ 8292AF0
 	walk_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_EventScript_292AF2:: @ 8292AF2
-LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
+PlayersHouse_1F_EventScript_GetSSTicketAndSeeLatiTV:: @ 8292AF2
 	lockall
 	checkplayergender
 	compare VAR_RESULT, MALE
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C76
+	call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale
 	compare VAR_RESULT, FEMALE
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C86
-	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D08
-	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D13
+	call_if_eq PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale
+	compare VAR_0x8008, MALE
+	call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomMale
+	compare VAR_0x8008, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_PlayerEnterRoomFemale
 	applymovement VAR_0x8009, Common_Movement_FacePlayer
 	waitmovement 0
 	playse SE_PIN
@@ -454,64 +443,64 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
 	applymovement VAR_0x8009, Common_Movement_Delay48
 	waitmovement 0
 	delay 20
-	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292C96
-	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CA1
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F800E, MSGBOX_DEFAULT
+	compare VAR_0x8008, MALE
+	call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerMale
+	compare VAR_0x8008, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_DadApproachPlayerFemale
+	msgbox PlayersHouse_1F_Text_TicketFromBrineyCameForYou, MSGBOX_DEFAULT
 	giveitem_std ITEM_SS_TICKET
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F80FE, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_PortsInSlateportLilycove, MSGBOX_DEFAULT
 	closemessage
 	delay 20
-	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CAC
-	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CC1
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F815B, MSGBOX_DEFAULT
+	compare VAR_0x8008, MALE
+	call_if_eq PlayersHouse_1F_EventScript_MomApproachDadMale
+	compare VAR_0x8008, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_MomApproachDadFemale
+	msgbox PlayersHouse_1F_Text_BetterGetBackToGym, MSGBOX_DEFAULT
 	closemessage
-	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CD6
-	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CEF
+	compare VAR_0x8008, MALE
+	call_if_eq PlayersHouse_1F_EventScript_DadExitsMale
+	compare VAR_0x8008, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_DadExitsFemale
 	playse SE_DOOR
 	removeobject VAR_0x8009
 	setflag FLAG_RECEIVED_SS_TICKET
 	delay 30
-	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D48
-	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D5D
+	compare VAR_0x8008, MALE
+	call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerMale
+	compare VAR_0x8008, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerFemale
 	delay 20
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_DadShouldStayLonger, MSGBOX_DEFAULT
 	closemessage
 	setflag FLAG_SYS_TV_LATIAS_LATIOS
 	special TurnOnTVScreen
 	delay 60
-	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D72
-	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D7D
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F824B, MSGBOX_DEFAULT
+	compare VAR_0x8008, MALE
+	call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale
+	compare VAR_0x8008, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale
+	msgbox PlayersHouse_1F_Text_IsThatABreakingStory, MSGBOX_DEFAULT
 	closemessage
-	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D1E
-	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D33
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
+	compare VAR_0x8008, MALE
+	call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale
+	compare VAR_0x8008, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale
+	msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT
 	closemessage
 	clearflag FLAG_SYS_TV_LATIAS_LATIOS
 	setflag FLAG_LATIOS_OR_LATIAS_ROAMING
 	special TurnOffTVScreen
-	compare VAR_0x8008, 0
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D88
-	compare VAR_0x8008, 1
-	call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D9D
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F8351, MSGBOX_DEFAULT
+	compare VAR_0x8008, MALE
+	call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale
+	compare VAR_0x8008, FEMALE
+	call_if_eq PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale
+	msgbox PlayersHouse_1F_Text_WhatColorDidTheySay, MSGBOX_DEFAULT
 	multichoice 22, 8, MULTI_TV_LATI, 1
 	copyvar VAR_0x8004, VAR_RESULT
 	special InitRoamer
 	copyvar VAR_ROAMER_POKEMON, VAR_RESULT
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F83A1, MSGBOX_DEFAULT
+	msgbox PlayersHouse_1F_Text_StillUnknownPokemon, MSGBOX_DEFAULT
 	closemessage
 	setvar VAR_LITTLEROOT_HOUSES_STATE, 4
 	setvar VAR_LITTLEROOT_HOUSES_STATE_2, 4
@@ -519,155 +508,155 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2
 	end
 
 @ Never called.
-LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72
+PlayersHouse_1F_EventScript_AirLatiBroadcast:: @ 8292C72
 	setflag FLAG_SYS_TV_LATIAS_LATIOS
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292C76:: @ 8292C76
-	setvar VAR_0x8008, 0
-	setvar VAR_0x8009, 5
-	setvar VAR_0x800A, 1
+PlayersHouse_1F_EventScript_SetUpObjectEventVarsMale:: @ 8292C76
+	setvar VAR_0x8008, MALE
+	setvar VAR_0x8009, 5  @ Dad object event ID
+	setvar VAR_0x800A, 1  @ Mom object event ID
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292C86:: @ 8292C86
-	setvar VAR_0x8008, 1
-	setvar VAR_0x8009, 5
-	setvar VAR_0x800A, 1
+PlayersHouse_1F_EventScript_SetUpObjectEventVarsFemale:: @ 8292C86
+	setvar VAR_0x8008, FEMALE
+	setvar VAR_0x8009, 5  @ Dad object event ID
+	setvar VAR_0x800A, 1  @ Mom object event ID
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292C96:: @ 8292C96
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB2
+PlayersHouse_1F_EventScript_DadApproachPlayerMale:: @ 8292C96
+	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerMale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292CA1:: @ 8292CA1
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB5
+PlayersHouse_1F_EventScript_DadApproachPlayerFemale:: @ 8292CA1
+	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadApproachPlayerFemale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292CAC:: @ 8292CAC
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292989
+PlayersHouse_1F_EventScript_MomApproachDadMale:: @ 8292CAC
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadMale
 	waitmovement 0
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DB8
+	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomMale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292CC1:: @ 8292CC1
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292991
+PlayersHouse_1F_EventScript_MomApproachDadFemale:: @ 8292CC1
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachDadFemale
 	waitmovement 0
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBA
+	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadFaceMomFemale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292CD6:: @ 8292CD6
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DBC
+PlayersHouse_1F_EventScript_DadExitsMale:: @ 8292CD6
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
+	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsMale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292CEF:: @ 8292CEF
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DCC
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292DCC
-	applymovement VAR_0x8009, LittlerootTown_BrendansHouse_1F_Movement_292DC1
+PlayersHouse_1F_EventScript_DadExitsFemale:: @ 8292CEF
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit
+	applymovement VAR_0x8009, PlayersHouse_1F_Movement_DadExitsFemale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D08:: @ 8292D08
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DC6
+PlayersHouse_1F_EventScript_PlayerEnterRoomMale:: @ 8292D08
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomMale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D13:: @ 8292D13
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD1
+PlayersHouse_1F_EventScript_PlayerEnterRoomFemale:: @ 8292D13
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerEnterRoomFemale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D1E:: @ 8292D1E
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DD7
+PlayersHouse_1F_EventScript_PlayerApproachTVForLatiMale:: @ 8292D1E
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale
 	waitmovement 0
 	applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D33:: @ 8292D33
-	applymovement EVENT_OBJ_ID_PLAYER, LittlerootTown_BrendansHouse_1F_Movement_292DDE
+PlayersHouse_1F_EventScript_PlayerApproachTVForLatiFemale:: @ 8292D33
+	applymovement EVENT_OBJ_ID_PLAYER, PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale
 	waitmovement 0
 	applymovement VAR_0x800A, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D48:: @ 8292D48
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_292999
+PlayersHouse_1F_EventScript_MomApproachPlayerMale:: @ 8292D48
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerMale
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D5D:: @ 8292D5D
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299B
+PlayersHouse_1F_EventScript_MomApproachPlayerFemale:: @ 8292D5D
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerFemale
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D72:: @ 8292D72
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_29299D
+PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastMale:: @ 8292D72
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastMale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D7D:: @ 8292D7D
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929A6
+PlayersHouse_1F_EventScript_MomNoticesLatiBroadcastFemale:: @ 8292D7D
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomNoticesLatiBroadcastFemale
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D88:: @ 8292D88
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929AF
+PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVMale:: @ 8292D88
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVMale
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestRight
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_EventScript_292D9D:: @ 8292D9D
-	applymovement VAR_0x800A, LittlerootTown_BrendansHouse_1F_Movement_2929B3
+PlayersHouse_1F_EventScript_MomApproachPlayerAfterTVFemale:: @ 8292D9D
+	applymovement VAR_0x800A, PlayersHouse_1F_Movement_MomApproachPlayerAfterTVFemale
 	waitmovement 0
 	applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceFastestLeft
 	waitmovement 0
 	return
 
-LittlerootTown_BrendansHouse_1F_Movement_292DB2: @ 8292DB2
+PlayersHouse_1F_Movement_DadApproachPlayerMale: @ 8292DB2
 	walk_right
 	walk_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DB5: @ 8292DB5
+PlayersHouse_1F_Movement_DadApproachPlayerFemale: @ 8292DB5
 	walk_left
 	walk_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DB8: @ 8292DB8
+PlayersHouse_1F_Movement_DadFaceMomMale: @ 8292DB8
 	face_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DBA: @ 8292DBA
+PlayersHouse_1F_Movement_DadFaceMomFemale: @ 8292DBA
 	face_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DBC: @ 8292DBC
+PlayersHouse_1F_Movement_DadExitsMale: @ 8292DBC
 	walk_down
 	walk_right
 	walk_down
 	delay_8
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DC1: @ 8292DC1
+PlayersHouse_1F_Movement_DadExitsFemale: @ 8292DC1
 	walk_down
 	walk_left
 	walk_down
 	delay_8
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6
+PlayersHouse_1F_Movement_PlayerEnterRoomMale: @ 8292DC6
 	delay_16
 	walk_down
 	walk_down
@@ -675,14 +664,14 @@ LittlerootTown_BrendansHouse_1F_Movement_292DC6: @ 8292DC6
 	walk_in_place_fastest_left
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DCC: @ 8292DCC
+PlayersHouse_1F_Movement_MomAndPlayerWatchDadExit: @ 8292DCC
 	delay_8
 	delay_16
 	delay_16
 	walk_in_place_fastest_down
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1
+PlayersHouse_1F_Movement_PlayerEnterRoomFemale: @ 8292DD1
 	delay_16
 	walk_down
 	walk_down
@@ -690,7 +679,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DD1: @ 8292DD1
 	walk_in_place_fastest_right
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7
+PlayersHouse_1F_Movement_PlayerApproachTVForLatiMale: @ 8292DD7
 	walk_up
 	walk_left
 	walk_left
@@ -699,7 +688,7 @@ LittlerootTown_BrendansHouse_1F_Movement_292DD7: @ 8292DD7
 	walk_in_place_fastest_up
 	step_end
 
-LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE
+PlayersHouse_1F_Movement_PlayerApproachTVForLatiFemale: @ 8292DDE
 	walk_up
 	walk_right
 	walk_right
@@ -709,5 +698,5 @@ LittlerootTown_BrendansHouse_1F_Movement_292DDE: @ 8292DDE
 	step_end
 
 EventScript_RunningShoesManual:: @ 8292DE5
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F66, MSGBOX_SIGN
+	msgbox PlayersHouse_1F_Text_RunningShoesManual, MSGBOX_SIGN
 	end
diff --git a/data/scripts/record_mix.inc b/data/scripts/record_mix.inc
new file mode 100644
index 000000000..f70b7f83e
--- /dev/null
+++ b/data/scripts/record_mix.inc
@@ -0,0 +1,23 @@
+@ Seems this was superseded by the Record Center, and the below scripts are now unused
+EventScript_MixRecordsPrompt:: @ 8271D5E
+	lock
+	faceplayer
+	msgbox Text_WouldYouLikeToMixRecords, MSGBOX_YESNO
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_MixRecords
+	compare VAR_RESULT, 0
+	goto_if_eq EventScript_DeclineMixRecords
+	goto EventScript_DeclineMixRecords
+
+EventScript_MixRecords:: @ 8271D83
+	special RecordMixingPlayerSpotTriggered
+	waitstate
+	lock
+	faceplayer
+
+EventScript_DeclineMixRecords:: @ 8271D89
+	message Text_WeHopeToSeeYouAgain
+	waitmessage
+	waitbuttonpress
+	release
+	end
diff --git a/data/scripts/repel.inc b/data/scripts/repel.inc
new file mode 100644
index 000000000..5deda5762
--- /dev/null
+++ b/data/scripts/repel.inc
@@ -0,0 +1,6 @@
+EventScript_RepelWoreOff:: @ 82A4B2A
+	msgbox Text_RepelWoreOff, MSGBOX_SIGN
+	end
+
+Text_RepelWoreOff: @ 82A4B33
+	.string "REPEL's effect wore off…$"
diff --git a/data/scripts/rival_graphics.inc b/data/scripts/rival_graphics.inc
new file mode 100644
index 000000000..60bd1a337
--- /dev/null
+++ b/data/scripts/rival_graphics.inc
@@ -0,0 +1,48 @@
+Common_EventScript_SetupRivalGfxId:: @ 8271ED7
+	checkplayergender
+	compare VAR_RESULT, MALE
+	goto_if_eq EventScript_SetupRivalGfxIdFemale
+	compare VAR_RESULT, FEMALE
+	goto_if_eq EventScript_SetupRivalGfxIdMale
+	end
+
+EventScript_SetupRivalGfxIdFemale:: @ 8271EEF
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+	return
+
+EventScript_SetupRivalGfxIdMale:: @ 8271EF5
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+Common_EventScript_SetupRivalOnBikeGfxId:: @ 8271EFB
+	checkplayergender
+	compare VAR_RESULT, MALE
+	goto_if_eq EventScript_SetupRivalOnBikeGfxIdFemale
+	compare VAR_RESULT, FEMALE
+	goto_if_eq EventScript_SetupRivalOnBikeGfxIdMale
+	end
+
+EventScript_SetupRivalOnBikeGfxIdFemale:: @ 8271F13
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_MAY_MACH_BIKE
+	return
+
+EventScript_SetupRivalOnBikeGfxIdMale:: @ 8271F19
+	setvar VAR_OBJ_GFX_ID_3, EVENT_OBJ_GFX_RIVAL_BRENDAN_MACH_BIKE
+	return
+
+@ Unused
+Common_EventScript_SetupRivalGfxIdSameGender:: @ 8271F1F
+	checkplayergender
+	compare VAR_RESULT, MALE
+	goto_if_eq EventScript_SetupRivalGfxIdMale2
+	compare VAR_RESULT, FEMALE
+	goto_if_eq EventScript_SetupRivalGfxIdFemale2
+	end
+
+EventScript_SetupRivalGfxIdMale2:: @ 8271F37
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL
+	return
+
+EventScript_SetupRivalGfxIdFemale2:: @ 8271F3D
+	setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_MAY_NORMAL
+	return
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 3539e0970..83cf5d16d 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -1,103 +1,103 @@
-EventScript_2A4B4C:: @ 82A4B4C
+SafariZone_EventScript_OutOfBallsMidBattle:: @ 82A4B4C
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	setwarp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	end
 
-EventScript_2A4B5D:: @ 82A4B5D
+SafariZone_EventScript_Exit:: @ 82A4B5D
 	setvar VAR_SAFARI_ZONE_STATE, 1
 	special ExitSafariMode
 	warp MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
 	waitstate
 	end
 
-EventScript_2A4B6F:: @ 82A4B6F
+SafariZone_EventScript_RetirePrompt:: @ 82A4B6F
 	lockall
-	msgbox Text_2A4BF4, MSGBOX_YESNO
+	msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_2A4B85
+	goto_if_eq SafariZone_EventScript_Retire
 	releaseall
 	end
 
-EventScript_2A4B85:: @ 82A4B85
-	goto EventScript_2A4B5D
+SafariZone_EventScript_Retire:: @ 82A4B85
+	goto SafariZone_EventScript_Exit
 
-EventScript_2A4B8A:: @ 82A4B8A
+SafariZone_EventScript_TimesUp:: @ 82A4B8A
 	lockall
 	playse SE_PINPON
-	message Text_2A4C26
+	message SafariZone_Text_TimesUp
 	waitmessage
 	waitbuttonpress
 	releaseall
-	goto EventScript_2A4B5D
+	goto SafariZone_EventScript_Exit
 
-EventScript_2A4B9B:: @ 82A4B9B
+SafariZone_EventScript_OutOfBalls:: @ 82A4B9B
 	lockall
 	playse SE_PINPON
-	message Text_2A4C56
+	message SafariZone_Text_OutOfBalls
 	waitmessage
 	waitbuttonpress
 	releaseall
-	goto EventScript_2A4B5D
+	goto SafariZone_EventScript_Exit
 
 EventScript_PokeBlockFeeder:: @ 82A4BAC
 	lockall
 	special GetPokeblockFeederInFront
-	compare VAR_RESULT, 65535
-	goto_if_ne EventScript_2A4BEB
-	msgbox Text_2A4C90, MSGBOX_YESNO
+	compare VAR_RESULT, 0xFFFF
+	goto_if_ne SafariZone_EventScript_PokeblockPresent
+	msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_2A4BD0
+	goto_if_eq SafariZone_EventScript_ChoosePokeblock
 	releaseall
 	end
 
-EventScript_2A4BD0:: @ 82A4BD0
+SafariZone_EventScript_ChoosePokeblock:: @ 82A4BD0
 	fadescreen 1
 	special OpenPokeblockCaseOnFeeder
 	waitstate
-	compare VAR_RESULT, 65535
-	goto_if_ne EventScript_2A4BE2
+	compare VAR_RESULT, 0xFFFF
+	goto_if_ne SafariZone_EventScript_PokeblockPlaced
 	end
 
-EventScript_2A4BE2:: @ 82A4BE2
-	message Text_2A4CEB
+SafariZone_EventScript_PokeblockPlaced:: @ 82A4BE2
+	message SafariZone_Text_PokeblockWasPlaced
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-EventScript_2A4BEB:: @ 82A4BEB
-	message Text_2A4CC5
+SafariZone_EventScript_PokeblockPresent:: @ 82A4BEB
+	message SafariZone_Text_PokeblockStillHere
 	waitmessage
 	waitbuttonpress
 	releaseall
 	end
 
-Text_2A4BF4: @ 82A4BF4
+SafariZone_Text_WouldYouLikeToExit: @ 82A4BF4
 	.string "Would you like to exit the SAFARI\n"
 	.string "ZONE right now?$"
 
-Text_2A4C26: @ 82A4C26
+SafariZone_Text_TimesUp: @ 82A4C26
 	.string "Ding-dong! Time's up!\n"
 	.string "Your SAFARI Game is over.$"
 
-Text_2A4C56: @ 82A4C56
+SafariZone_Text_OutOfBalls: @ 82A4C56
 	.string "You've run out of SAFARI BALLS.\n"
 	.string "Your SAFARI Game is over.$"
 
-Text_2A4C90: @ 82A4C90
+SafariZone_Text_PlacePokeblockOnFeeder: @ 82A4C90
 	.string "Would you like to place a {POKEBLOCK}\n"
 	.string "on the {POKEBLOCK} FEEDER?$"
 
-Text_2A4CC5: @ 82A4CC5
+SafariZone_Text_PokeblockStillHere: @ 82A4CC5
 	.string "The {STR_VAR_1} you left\n"
 	.string "before is still here.$"
 
-Text_2A4CEB: @ 82A4CEB
+SafariZone_Text_PokeblockWasPlaced: @ 82A4CEB
 	.string "The {STR_VAR_1} was placed\n"
 	.string "on the {POKEBLOCK} FEEDER.$"
 
-Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12
+Route121_SafariZoneEntrance_Text_WelcomeToSafariZone: @ 82A4D12
 	.string "Welcome to the SAFARI ZONE!\p"
 	.string "Here, you may witness many kinds of\n"
 	.string "POKéMON rarely seen in HOENN.\p"
@@ -109,14 +109,14 @@ Route121_SafariZoneEntrance_Text_2A4D12: @ 82A4D12
 	.string "for keeps!\p"
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_2A4E46: @ 82A4E46
+Route121_SafariZoneEntrance_Text_WelcomeFirstTime: @ 82A4E46
 	.string "Welcome to the SAFARI ZONE!\n"
 	.string "Is it your first time here?$"
 
-Route121_SafariZoneEntrance_Text_2A4E7E: @ 82A4E7E
+Route121_SafariZoneEntrance_Text_ComeInAndEnjoy: @ 82A4E7E
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1
+Route121_SafariZoneEntrance_Text_FirstTimeInfo: @ 82A4EA1
 	.string "When you enter the SAFARI ZONE, you\n"
 	.string "start with 30 SAFARI BALLS for\l"
 	.string "catching POKéMON.\p"
@@ -125,39 +125,39 @@ Route121_SafariZoneEntrance_Text_2A4EA1: @ 82A4EA1
 	.string "walked 500 steps.\p"
 	.string "Come in and enjoy the SAFARI ZONE!$"
 
-Route121_SafariZoneEntrance_Text_2A4F74: @ 82A4F74
+Route121_SafariZoneEntrance_Text_WouldYouLikeToPlay: @ 82A4F74
 	.string "Welcome to the SAFARI ZONE!\p"
 	.string "All you can catch for just ¥500!\n"
 	.string "Would you like to play a SAFARI Game?$"
 
-Route121_SafariZoneEntrance_Text_2A4FD7: @ 82A4FD7
+Route121_SafariZoneEntrance_Text_PlayAnotherTime: @ 82A4FD7
 	.string "Okay.\n"
 	.string "Please play another time!$"
 
-Route121_SafariZoneEntrance_Text_2A4FF7: @ 82A4FF7
+Route121_SafariZoneEntrance_Text_NotEnoughMoney: @ 82A4FF7
 	.string "You don't have enough money.\n"
 	.string "Sorry.$"
 
-Route121_SafariZoneEntrance_Text_2A501B: @ 82A501B
+Route121_SafariZoneEntrance_Text_ThatWillBe500Please: @ 82A501B
 	.string "That will be ¥500, please.$"
 
-Route121_SafariZoneEntrance_Text_2A5036: @ 82A5036
+Route121_SafariZoneEntrance_Text_HereAreYourSafariBalls: @ 82A5036
 	.string "Here are your SAFARI BALLS.$"
 
-Route121_SafariZoneEntrance_Text_2A5052: @ 82A5052
+Route121_SafariZoneEntrance_Text_Received30SafariBalls: @ 82A5052
 	.string "{PLAYER} received 30 SAFARI BALLS.$"
 
-Route121_SafariZoneEntrance_Text_2A506F: @ 82A506F
+Route121_SafariZoneEntrance_Text_PleaseEnjoyYourself: @ 82A506F
 	.string "We'll let you know when your game\n"
 	.string "is over.\p"
 	.string "So, until then, enjoy yourself, please!\n"
 	.string "Off you go on your wild excursion!$"
 
-Route121_SafariZoneEntrance_Text_2A50E5: @ 82A50E5
+Route121_SafariZoneEntrance_Text_PCIsFull: @ 82A50E5
 	.string "Excuse me!\n"
 	.string "Your PC BOX is full.$"
 
-Route121_SafariZoneEntrance_Text_2A5105: @ 82A5105
+Route121_SafariZoneEntrance_Text_YouNeedPokeblockCase: @ 82A5105
 	.string "Excuse me!\n"
 	.string "You seem to be without a {POKEBLOCK} CASE.\p"
 	.string "Your SAFARI Game will be much more\n"
@@ -166,129 +166,129 @@ Route121_SafariZoneEntrance_Text_2A5105: @ 82A5105
 	.string "You may obtain a {POKEBLOCK} CASE from\n"
 	.string "the LILYCOVE CONTEST HALL.$"
 
-SafariZone_South_Text_2A51D4: @ 82A51D4
+SafariZone_South_Text_StillHaveTimeExit: @ 82A51D4
 	.string "You still have time left. Would you like\n"
 	.string "to exit the SAFARI ZONE now?$"
 
-SafariZone_South_Text_2A521A: @ 82A521A
+SafariZone_South_Text_EnjoyTheRestOfYourAdventure: @ 82A521A
 	.string "Please enjoy the rest of your wild\n"
 	.string "adventure!$"
 
-SafariZone_South_Text_2A5248: @ 82A5248
+SafariZone_South_Text_ExitEarlyThankYouForPlaying: @ 82A5248
 	.string "Okay.\p"
 	.string "I'll take back your remaining SAFARI\n"
 	.string "BALLS.\p"
 	.string "Thank you for playing.\n"
 	.string "We hope to see you again.$"
 
-SafariZone_South_Text_2A52AB: @ 82A52AB
+SafariZone_South_Text_GoodLuck: @ 82A52AB
 	.string "Good luck!\p"
 	.string "If you need anything, don't hesitate\n"
 	.string "to tell me, please!$"
 
-SafariZone_South_Text_2A52EF: @ 82A52EF
+SafariZone_South_Text_Boy: @ 82A52EF
 	.string "Did you know?\p"
 	.string "If you put a {POKEBLOCK} in that square box,\n"
 	.string "POKéMON gather around.$"
 
-SafariZone_South_Text_2A533B: @ 82A533B
+SafariZone_South_Text_Man: @ 82A533B
 	.string "I want to keep going deeper, but I\n"
 	.string "forgot to bring a BIKE.\p"
 	.string "Something tells me that rare POKéMON\n"
 	.string "live in the outlying areas.$"
 
-SafariZone_Southwest_Text_2A53B7: @ 82A53B7
+SafariZone_Southwest_Text_Woman: @ 82A53B7
 	.string "Sometimes, when I toss a {POKEBLOCK} at \n"
 	.string "POKéMON, it gets ignored.\p"
 	.string "Do POKéMON have likes and dislikes\n"
 	.string "about what they eat?$"
 
-SafariZone_Northwest_Text_2A542C: @ 82A542C
+SafariZone_Northwest_Text_Man: @ 82A542C
 	.string "Gasp… Gasp…\n"
 	.string "I…made it out here…but…\p"
 	.string "I'm exhausted… I don't have the\n"
 	.string "energy to catch POKéMON…$"
 
-SafariZone_North_Text_2A5489: @ 82A5489
+SafariZone_North_Text_Fisherman: @ 82A5489
 	.string "I'm on a mission to find WATER POKéMON\n"
 	.string "you don't see in HOENN.\p"
 	.string "Do you have any idea where the lake is?$"
 
-SafariZone_North_Text_2A54F0: @ 82A54F0
+SafariZone_North_Text_Man: @ 82A54F0
 	.string "I'm going to catch a lot of rare POKéMON\n"
 	.string "here and trade them with my friends!$"
 
-SafariZone_South_Text_2A553E: @ 82A553E
+SafariZone_South_Text_Youngster: @ 82A553E
 	.string "I put a {POKEBLOCK} on the {POKEBLOCK} FEEDER.\n"
 	.string "But it seems to have disappeared.\p"
 	.string "I guess POKéMON must have eaten it\n"
 	.string "without me noticing.$"
 
-Route121_SafariZoneEntrance_Text_2A55BB: @ 82A55BB
+Route121_SafariZoneEntrance_Text_TrainerTip: @ 82A55BB
 	.string "SAFARI ZONE TRAINER TIP!\p"
 	.string "Throw {POKEBLOCK}S at wild POKéMON to make\n"
 	.string "them less likely to flee.$"
 
-SafariZone_Southwest_Text_2A5613: @ 82A5613
+SafariZone_Southwest_Text_RestHouseSign: @ 82A5613
 	.string "“Relieve your tired feet.”\n"
 	.string "REST HOUSE$"
 
-SafariZone_RestHouse_Text_2A5639: @ 82A5639
+SafariZone_RestHouse_Text_Youngster: @ 82A5639
 	.string "I don't have any {POKEBLOCK}S, but I caught\n"
 	.string "a good number of POKéMON.\p"
 	.string "You can improve your chances of making\n"
 	.string "a catch by getting closer to them\l"
 	.string "before throwing a SAFARI BALL.$"
 
-SafariZone_RestHouse_Text_2A56E1: @ 82A56E1
+SafariZone_RestHouse_Text_PsychicM: @ 82A56E1
 	.string "If you use {POKEBLOCK}S, wild POKéMON won't\n"
 	.string "be so quick to run away.\p"
 	.string "It's not much use to give {POKEBLOCK}S to\n"
 	.string "POKéMON that don't flee easily.$"
 
-SafariZone_RestHouse_Text_2A5764: @ 82A5764
+SafariZone_RestHouse_Text_FatMan: @ 82A5764
 	.string "If you put a {POKEBLOCK} on the FEEDER,\n"
 	.string "POKéMON are attracted to it.\p"
 	.string "I think POKéMON with the same sort of\n"
 	.string "nature are drawn by a certain {POKEBLOCK}.$"
 
-SafariZone_South_Text_2A57EE: @ 82A57EE
+SafariZone_South_Text_AreaOffLimits1: @ 82A57EE
 	.string "This area is still under construction.\n"
 	.string "It's off-limits, sorry!$"
 
-SafariZone_Southeast_Text_2A582D: @ 82A582D
+SafariZone_Southeast_Text_ExpansionIsFinished: @ 82A582D
 	.string "The SAFARI ZONE's expansion project\n"
 	.string "is finished now.\p"
 	.string "We hope you will enjoy the new area.$"
 
-SafariZone_South_Text_2A5887: @ 82A5887
+SafariZone_South_Text_AreaOffLimits2: @ 82A5887
 	.string "This area is still under construction.\n"
 	.string "It's off-limits, sorry!$"
 
-SafariZone_Southeast_Text_2A58C6: @ 82A58C6
+SafariZone_Southeast_Text_LittleGirl: @ 82A58C6
 	.string "Wow! Whee! I haven't seen any of\n"
 	.string "these POKéMON before!$"
 
-SafariZone_Southeast_Text_2A58FD: @ 82A58FD
+SafariZone_Southeast_Text_FatMan: @ 82A58FD
 	.string "The POKéMON in this area are all\n"
 	.string "new to me.\p"
 	.string "And I'm allowed to catch these rare\n"
 	.string "POKéMON! Too cool!$"
 
-SafariZone_Southeast_Text_2A5960: @ 82A5960
+SafariZone_Southeast_Text_RichBoy: @ 82A5960
 	.string "The POKéMON around here seem to be\n"
 	.string "from somewhere other than HOENN.$"
 
-SafariZone_Northeast_Text_2A59A4: @ 82A59A4
+SafariZone_Northeast_Text_Boy: @ 82A59A4
 	.string "I only have a couple SAFARI BALLS left.\p"
 	.string "I'm having a hard time trying to\n"
 	.string "decide what I should catch.$"
 
-SafariZone_Northeast_Text_2A5A09: @ 82A5A09
+SafariZone_Northeast_Text_Woman: @ 82A5A09
 	.string "I heard that you can see PIKACHU here.\n"
 	.string "Where might one be?$"
 
-SafariZone_Northeast_Text_2A5A44: @ 82A5A44
+SafariZone_Northeast_Text_Girl: @ 82A5A44
 	.string "Oh, boo!\n"
 	.string "I can't seem to catch anything!\p"
 	.string "I'll end up wasting the admission\n"
diff --git a/data/scripts/set_gym_trainers.inc b/data/scripts/set_gym_trainers.inc
new file mode 100644
index 000000000..1f5535805
--- /dev/null
+++ b/data/scripts/set_gym_trainers.inc
@@ -0,0 +1,92 @@
+Common_EventScript_SetGymTrainers:: @ 8271F43
+	switch VAR_0x8008
+	case 1, RusboroCity_Gym_SetGymTrainers
+	case 2, DewfordTown_Gym_SetGymTrainers
+	case 3, MauvilleCity_Gym_SetGymTrainers
+	case 4, LavaridgeTown_Gym_SetGymTrainers
+	case 5, PetalburgCity_Gym_SetGymTrainers
+	case 6, FortreeCity_Gym_SetGymTrainers
+	case 7, MossdeepCity_Gym_SetGymTrainers
+	case 8, SootopolisCity_Gym_SetGymTrainers
+	end
+
+RusboroCity_Gym_SetGymTrainers:: @ 8271FA1
+	settrainerflag TRAINER_JOSH
+	settrainerflag TRAINER_TOMMY
+	settrainerflag TRAINER_MARC
+	return
+
+DewfordTown_Gym_SetGymTrainers:: @ 8271FAB
+	settrainerflag TRAINER_TAKAO
+	settrainerflag TRAINER_JOCELYN
+	settrainerflag TRAINER_LAURA
+	settrainerflag TRAINER_BRENDEN
+	settrainerflag TRAINER_CRISTIAN
+	settrainerflag TRAINER_LILITH
+	return
+
+MauvilleCity_Gym_SetGymTrainers:: @ 8271FBE
+	settrainerflag TRAINER_KIRK
+	settrainerflag TRAINER_SHAWN
+	settrainerflag TRAINER_BEN
+	settrainerflag TRAINER_VIVIAN
+	settrainerflag TRAINER_ANGELO
+	return
+
+LavaridgeTown_Gym_SetGymTrainers:: @ 8271FCE
+	settrainerflag TRAINER_COLE
+	settrainerflag TRAINER_AXLE
+	settrainerflag TRAINER_KEEGAN
+	settrainerflag TRAINER_GERALD
+	settrainerflag TRAINER_DANIELLE
+	settrainerflag TRAINER_JACE
+	settrainerflag TRAINER_JEFF
+	settrainerflag TRAINER_ELI
+	return
+
+PetalburgCity_Gym_SetGymTrainers:: @ 8271FE7
+	settrainerflag TRAINER_RANDALL
+	settrainerflag TRAINER_PARKER
+	settrainerflag TRAINER_GEORGE
+	settrainerflag TRAINER_BERKE
+	settrainerflag TRAINER_MARY
+	settrainerflag TRAINER_ALEXIA
+	settrainerflag TRAINER_JODY
+	return
+
+FortreeCity_Gym_SetGymTrainers:: @ 8271FFD
+	settrainerflag TRAINER_JARED
+	settrainerflag TRAINER_FLINT
+	settrainerflag TRAINER_ASHLEY
+	settrainerflag TRAINER_EDWARDO
+	settrainerflag TRAINER_HUMBERTO
+	settrainerflag TRAINER_DARIUS
+	return
+
+MossdeepCity_Gym_SetGymTrainers:: @ 8272010
+	settrainerflag TRAINER_PRESTON
+	settrainerflag TRAINER_VIRGIL
+	settrainerflag TRAINER_BLAKE
+	settrainerflag TRAINER_HANNAH
+	settrainerflag TRAINER_SAMANTHA
+	settrainerflag TRAINER_MAURA
+	settrainerflag TRAINER_SYLVIA
+	settrainerflag TRAINER_NATE
+	settrainerflag TRAINER_KATHLEEN
+	settrainerflag TRAINER_CLIFFORD
+	settrainerflag TRAINER_MACEY
+	settrainerflag TRAINER_NICHOLAS
+	return
+
+SootopolisCity_Gym_SetGymTrainers:: @ 8272035
+	settrainerflag TRAINER_ANDREA
+	settrainerflag TRAINER_CRISSY
+	settrainerflag TRAINER_BRIANNA
+	settrainerflag TRAINER_CONNIE
+	settrainerflag TRAINER_BRIDGET
+	settrainerflag TRAINER_OLIVIA
+	settrainerflag TRAINER_TIFFANY
+	settrainerflag TRAINER_BETHANY
+	settrainerflag TRAINER_ANNIKA
+	settrainerflag TRAINER_DAPHNE
+	return
diff --git a/data/scripts/shared_secret_base.inc b/data/scripts/shared_secret_base.inc
index 933835a73..3f83e38b0 100644
--- a/data/scripts/shared_secret_base.inc
+++ b/data/scripts/shared_secret_base.inc
@@ -20,7 +20,7 @@ SecretBase_MapScript2_OnFrame: @ 823B4AE
     .2byte 0
 
 SecretBase_MapScript1_OnResume: @ 823B4B8
-    setstepcallback 6
+    setstepcallback STEP_CB_SECRET_BASE
     end
 
 SecretBase_EventScript_PC:: @ 823B4BB
diff --git a/data/scripts/surf.inc b/data/scripts/surf.inc
new file mode 100644
index 000000000..154cc53c2
--- /dev/null
+++ b/data/scripts/surf.inc
@@ -0,0 +1,16 @@
+EventScript_UseSurf:: @ 8271EA0
+	checkpartymove MOVE_SURF
+	compare VAR_RESULT, PARTY_SIZE
+	goto_if_eq EventScript_EndUseSurf
+	bufferpartymonnick 0, VAR_RESULT
+	setfieldeffectargument 0, VAR_RESULT
+	lockall
+	msgbox gText_WantToUseSurf, MSGBOX_YESNO
+	compare VAR_RESULT, 0
+	goto_if_eq EventScript_ReleaseUseSurf
+	msgbox gText_PlayerUsedSurf, MSGBOX_DEFAULT
+	dofieldeffect FLDEFF_USE_SURF
+EventScript_ReleaseUseSurf:: @ 8271ED5
+	releaseall
+EventScript_EndUseSurf:: @ 8271ED6
+	end
diff --git a/data/scripts/test_signpost.inc b/data/scripts/test_signpost.inc
new file mode 100644
index 000000000..482fe18f2
--- /dev/null
+++ b/data/scripts/test_signpost.inc
@@ -0,0 +1,7 @@
+Text_ThisIsATestSignpostMsg:: @ 82C840A
+	.string "This is a test message.\n"
+	.string "This is a signpost.$"
+
+EventScript_TestSignpostMsg:: @ 82C8436
+	msgbox Text_ThisIsATestSignpostMsg, MSGBOX_SIGN
+	end
diff --git a/data/scripts/trainer_battle.inc b/data/scripts/trainer_battle.inc
index 21ba0d6d3..0ba8bcda6 100644
--- a/data/scripts/trainer_battle.inc
+++ b/data/scripts/trainer_battle.inc
@@ -1,3 +1,7 @@
+EventScript_271354:: @ 8271354
+	cmdD8
+	cmdD9
+
 EventScript_ShowSecondTrainerIntro:: @ 8271356
 	special SetUpTrainerEncounterMusic
 	special EndTrainerApproach
diff --git a/data/scripts/trainer_script.inc b/data/scripts/trainer_script.inc
new file mode 100644
index 000000000..59577e8a8
--- /dev/null
+++ b/data/scripts/trainer_script.inc
@@ -0,0 +1,23 @@
+Std_RegisteredInMatchCall:: @ 82742C9
+	buffertrainerclassname 0, VAR_0x8000
+	buffertrainername 1, VAR_0x8000
+	closemessage
+	delay 30
+	playfanfare MUS_ME_TORE_EYE
+	msgbox gText_RegisteredTrainerinPokeNav, MSGBOX_DEFAULT
+	waitfanfare
+	closemessage
+	delay 30
+	return
+
+EventScript_TryGetTrainerScript:: @ 82742E6
+	special ShouldTryGetTrainerScript
+	compare VAR_RESULT, 1
+	goto_if_eq EventScript_GotoTrainerScript
+	releaseall
+	end
+
+EventScript_GotoTrainerScript:: @ 82742F6
+	gotobeatenscript
+	releaseall
+	end
diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc
index ed279d478..427775a76 100644
--- a/data/scripts/tv.inc
+++ b/data/scripts/tv.inc
@@ -4,9 +4,9 @@ EventScript_TV:: @ 827EE0B
 	special ResetTVShowState
 	specialvar VAR_RESULT, CheckForBigMovieOrEmergencyNewsOnTV
 	compare VAR_RESULT, 2
-	goto_if_eq EventScript_27EE9A
+	goto_if_eq EventScript_PlayersHouseMovie
 	compare VAR_RESULT, 1
-	goto_if_eq EventScript_27EEA4
+	goto_if_eq EventScript_PlayersHouseLatiNewsFlash
 	goto_if_unset FLAG_SYS_TV_START, EventScript_27EE8A
 	goto_if_set FLAG_SYS_TV_WATCH, EventScript_27EE8A
 	specialvar VAR_RESULT, IsTVShowInSearchOfTrainersAiring
@@ -35,13 +35,13 @@ EventScript_27EE8A:: @ 827EE8A
 	releaseall
 	end
 
-EventScript_27EE9A:: @ 827EE9A
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F7F0F, MSGBOX_DEFAULT
+EventScript_PlayersHouseMovie:: @ 827EE9A
+	msgbox PlayersHouse_1F_Text_TheresAMovieOnTV, MSGBOX_DEFAULT
 	releaseall
 	end
 
-EventScript_27EEA4:: @ 827EEA4
-	msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT
+EventScript_PlayersHouseLatiNewsFlash:: @ 827EEA4
+	msgbox PlayersHouse_1F_Text_LatiEmergencyNewsFlash, MSGBOX_DEFAULT
 	@ This is a junk call. Its input var (VAR_0x8004) hasn't been set, and
 	@ It's called again when Mom actually asks for the color, overwriting
 	@ whatever it does here.